Merge branch 'hotfix/1.0.18' v1.0.18
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 17 Feb 2016 14:42:27 +0000 (09:42 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 17 Feb 2016 14:42:27 +0000 (09:42 -0500)
commitdf703444b3670a40528608b2594401773506816d
tree0f8f260879837d1ff35ffbe2d2942d91d014ad82
parent5b74de004361a29b488417baff3a8edb654519fb
parenta5886ea502b68b4f100887e52a149ae75469d4c0
Merge branch 'hotfix/1.0.18'