Merge branch 'hotfix/1.1.4' v1.1.4
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 2 Feb 2016 19:07:18 +0000 (14:07 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 2 Feb 2016 19:07:18 +0000 (14:07 -0500)
commit1f24e07ceea077b75a4159a10033909187ab95d7
treef5c03684c63b5aa542e3cf3cff3a9f65a8615457
parent188142dea2834aff3adaebe8b10407059033d6a9
parentacee54ba5050c0ed4fee565b7ca8f3f32e3399d4
Merge branch 'hotfix/1.1.4'