Merge branch 'hotfix/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 May 2015 19:30:19 +0000 (15:30 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 May 2015 19:30:19 +0000 (15:30 -0400)
commit8146938a13ecdfc317cdc1b86da3779d7c16d3ff
treec638a7e455e5e868b49a173a87b7587529994692
parent569a44e5d90bc8ca01981521973249fcef0f584a
parentebfae85e6af296da6a0f2956ba06fa49cae9a52b
Merge branch 'hotfix/1.0.2'