Merge branch 'hotfix/1.0.26' v1.0.26
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 31 Mar 2016 18:27:00 +0000 (14:27 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 31 Mar 2016 18:27:00 +0000 (14:27 -0400)
commitf8d3136d4fd5eb523374aca97eeeced3fc810a64
treeaededaa55e0592639ad474247643455028820ddb
parent290ae1f7c51c9997b998e168d28a5f9ed18aa091
parent13f0a59c30b0fcb56925fb20d20424ae0312404e
Merge branch 'hotfix/1.0.26'