Merge branch 'hotfix/1.1.1' v1.1.1
authorLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 16:32:00 +0000 (11:32 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 16:32:00 +0000 (11:32 -0500)
commit46609ffc6560cb6b094fd72f9424c37b541f5e62
treeec9a71eebf79a4511c68405c024bf80dc78733f1
parentf220f4cc0af887560e2e547a98008ea96023c1d5
parent87e20923174fd540a6a084cc89f11d21466375b0
Merge branch 'hotfix/1.1.1'