Merge branch 'hotfix/1.0.1' v1.0.1
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 17 Jul 2014 15:47:14 +0000 (11:47 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 17 Jul 2014 15:47:14 +0000 (11:47 -0400)
commit2284ce7b12da2f37890eb44b9a1da6f53e8bdce2
treeaecff471964d65ae230c71c2425c846fe6e39696
parentfb6dd0b6216e3ad71fae461cfc53a9cc2b5d12ce
parentcf3aeec602ee0eabbb6eedc49dec2cad822d0915
Merge branch 'hotfix/1.0.1'