Merge branch 'hotfix/1.1.5' v1.1.5
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 10 Aug 2016 20:48:43 +0000 (16:48 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 10 Aug 2016 20:48:43 +0000 (16:48 -0400)
commit800023dd4e5db8d9e6ff1d1abd9f99b5de94ee99
tree604b00a35a2fa62d470c0ecf5b2c278d0eb0e2b5
parentfbed8bbda4c816728f5019676ec198b6bd0aa8da
parent740f9b315befb63b43f9964553056c6beb4875fe
Merge branch 'hotfix/1.1.5'