Merge branch 'hotfix/1.1.2' v1.1.2
authorIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 18:11:46 +0000 (14:11 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 18:11:46 +0000 (14:11 -0400)
commit66e6a91f17b250882e4e9d4776677fe29e99c272
treee8b5cb9035377d6550f034fbf94a758f20f51d39
parent047d2183baf60b10cfab0239bba3172a1c3601a8
parent1a2bf9dd5a71135386b54a2d98f3cb650340da2d
Merge branch 'hotfix/1.1.2'