Merge branch 'hotfix/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 17 Jul 2014 16:40:22 +0000 (12:40 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 17 Jul 2014 16:40:22 +0000 (12:40 -0400)
commit90c1d56980c2aa7fc9c1a8ae47dd129b50528f8a
treeae53ed0bcf29a7279663568694d135bb5cf63c6f
parent2284ce7b12da2f37890eb44b9a1da6f53e8bdce2
parent9cc58ff7b8717e95456e182f7150388b25a11547
Merge branch 'hotfix/1.0.2'