Merge branch 'hotfix/1.0.2'
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 18 Nov 2015 19:03:02 +0000 (14:03 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 18 Nov 2015 19:03:02 +0000 (14:03 -0500)
commit8ff36ecf1d555922cb4241c3d7ad9f77f2faf1d2
tree7515c29252c252428c805664bf2af828bf433100
parent33a73c16da4dd0c744ea1f9fa791a95f6abad55b
parented5bdd0676b346e94caecd2b585c0759b2b84b47
Merge branch 'hotfix/1.0.2'