Merge branch 'hotfix/1.0.24' v1.0.24
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 18 Apr 2016 16:42:35 +0000 (12:42 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 18 Apr 2016 16:42:35 +0000 (12:42 -0400)
commitf64dc1bc1ba303048225388073389b4da198d4a7
tree3fa06dc91e4d182dbe01690c77fb51f5a1762e6e
parent0fc63bd08e9755cd23c32c19cc7d15518fc69696
parent0f8a3f4eb0640d6f9950a7374ad4dfa73377aca0
Merge branch 'hotfix/1.0.24'