Merge branch 'hotfix/1.0.21' v1.0.21
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 19 Feb 2016 17:12:27 +0000 (12:12 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 19 Feb 2016 17:12:27 +0000 (12:12 -0500)
commit505e9df0a24095d445553715b5715045629e80b1
tree7fa6c63d1df290c90cf24cebf353c2a8713666cd
parent35ac26886ced65dc26a5f44e39d9dc5e9c9e7457
parentd403cccf97987cf361845c3d285547adfc8d1b7d
Merge branch 'hotfix/1.0.21'