Merge branch 'hotfix/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 2 Sep 2014 16:03:18 +0000 (12:03 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 2 Sep 2014 16:03:18 +0000 (12:03 -0400)
commitb2b4d7ec5fe1a89aaebb181b3063af62714ed916
treea34daa71bc574faeed447a4d77b0481f7f50e494
parent81e3426403c69623470752fe7be95071798c4b89
parentc5c8db0581a064ace9a88e7a6fb54b7e9002d8dd
Merge branch 'hotfix/1.0.2'