Merge branch 'hotfix/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 4 Feb 2016 16:52:15 +0000 (11:52 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 4 Feb 2016 16:52:15 +0000 (11:52 -0500)
commitba065e67a6a63f5407018cf61ffa7a18257ddf3d
tree984508ecf2b2a47779391447b6520a50d0c26ebf
parent65cc3b6b43f8d97c229f09554c37912e9bd24536
parente92eb2bf0410f17258b13c1854c2ab59ccc1b58b
Merge branch 'hotfix/1.0.4'