Merge branch 'hotfix/1.0.1' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Jul 2015 18:05:26 +0000 (14:05 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Jul 2015 18:05:26 +0000 (14:05 -0400)
commit5700a81ed7cbc8e0c827d5715476ae56c97c3ee5
tree7241e658253634ff67750f64b09415f930a80af2
parentb8a9b5aa37c1e1e394fa8f2b3e1580fae8510aab
parent202fa419dd9c40c04693168c3e6057e780ac1ec8
Merge branch 'hotfix/1.0.1' into develop