Merge branch 'hotfix/1.0.2' v1.0.2
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 27 May 2016 20:37:37 +0000 (16:37 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 27 May 2016 20:37:37 +0000 (16:37 -0400)
commit2c26d25fd94341dd1c8979e3994e467706e87a06
tree8d159108f62b4fc45ba1579edd0e0365b585650e
parent6edccc8ec3eeab00f6150501b0876143d8e6aa96
parentc166667bbaa40b848d9ab602d1eaec3a0080c48d
Merge branch 'hotfix/1.0.2'