Merge branch 'hotfix/1.0.18' v1.0.18
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Feb 2016 21:46:59 +0000 (16:46 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Feb 2016 21:46:59 +0000 (16:46 -0500)
commit8b4a46dfbe15705203d67b766cece85b0b2b4c02
tree3d213439127954f46bc8cca9cc6b60f2c7d19a2b
parent0b919095ef104696f5e9e943d9c668be7adb1495
parent03c25231d439c0820af5e817663ff271b51191ea
Merge branch 'hotfix/1.0.18'