Merge branch 'hotfix/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 26 May 2016 21:21:02 +0000 (17:21 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 26 May 2016 21:21:02 +0000 (17:21 -0400)
commitd5cbad6a823e5b1024b8fb9079f694d5ac3a697d
tree6d199a23fde50ec51b75bcfe76a7438924812f93
parentcbc79c3767674824b548b4510a9a2f459378b4a1
parent431a6cdc5bb9f7bae92f348c30628b815d0babc2
Merge branch 'hotfix/1.0.2'