Merge branch 'hotfix/1.0.5'
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 16 Nov 2015 19:59:52 +0000 (14:59 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 16 Nov 2015 19:59:52 +0000 (14:59 -0500)
commitef2bafc224b7d77fd6c061a3e755dffe15a28a40
treedf3a2ca8c603efb06a5a47df74b1f803720f83fe
parent7c1c87c9fc69b4f483dffe00591b9efb9d920b6a
parentadf7e07bb6f39af9713a667a08636fd39e29eb88
Merge branch 'hotfix/1.0.5'