Merge branch 'hotfix/1.0.2' v1.0.2
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 18 Apr 2016 11:55:31 +0000 (07:55 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 18 Apr 2016 11:55:31 +0000 (07:55 -0400)
commit293f65c32699ff09ac5a67a3713fcc619c823b8f
treecefdd88bf581c33fc7fe7a163fbb4ff37cb5e505
parent23a2bef5aead8d8b8129de8ffb04a51373c6092f
parentdfa74cad7f60bdfe05e7b3549bb262c48b3a71c1
Merge branch 'hotfix/1.0.2'