Merge branch 'hotfix/1.0.2' v1.0.2
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 29 Jan 2016 20:54:45 +0000 (15:54 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 29 Jan 2016 20:54:45 +0000 (15:54 -0500)
commitc4afd39b7a05e800e2ba195b2db3f299ffd73dd0
tree304eeee4e10ae628b29bd2c9e444ed9ccaaf8921
parente0fb60209d9860b02de2c0cf919308ecff8d168a
parent336925653250b547e46c9c9a2fd0663f18bacc21
Merge branch 'hotfix/1.0.2'