Merge branch 'hotfix/1.0.2' v1.0.2
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 8 Apr 2016 14:45:22 +0000 (10:45 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 8 Apr 2016 14:45:22 +0000 (10:45 -0400)
commit0d54f7498093a6e2e576ab8623644e1730b699e8
treede2f5fee75fb943bcca46cee24133c0a8d432a11
parent2f9ee94257b359ab9e8b158731310ee20f650ded
parent5ba7f9e9704f697783cc7baced5c1ecff2ee40fd
Merge branch 'hotfix/1.0.2'