Merge branch 'hotfix/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 12 May 2016 17:15:38 +0000 (13:15 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 12 May 2016 17:15:38 +0000 (13:15 -0400)
commit641e4506535e8cac2e4c8130ebab57ebdfc779dd
treee8c97d9587ef6706ffce32d607f873e178356042
parentab1964be820ce38ec93da029474ed3ddb8535062
parent7405d2596f44c8a11a65b52fc25f0639ac69e1ec
Merge branch 'hotfix/1.0.2'