Merge branch 'hotfix/2.1.5' v2.1.5
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 17 Jun 2016 17:17:57 +0000 (13:17 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 17 Jun 2016 17:17:57 +0000 (13:17 -0400)
commit7772c7013cc70a19d6cbf637a328e7a84f05cbc2
tree8a8e255926edf4b0e38dce797d7db83b457b6f31
parent8957675931b67164552836b7f820754cc226dbd2
parent6b3d110692a4c35ed4e25847449a4100ed8f9d40
Merge branch 'hotfix/2.1.5'