Merge branch 'hotfix/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Aug 2014 15:46:27 +0000 (11:46 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Aug 2014 15:46:27 +0000 (11:46 -0400)
commit7dc8a0b7325ef1bc57059c850425d4e7a8418928
treea5ec3129159332abbb99e8133ebb7d32acbd18c1
parent8da21c43eabe0235fd2a8a3a4de1ebb0325dc849
parent76457e09460263005bdd434889c1fc23d43b91d7
Merge branch 'hotfix/1.0.5'