Merge branch 'hotfix/1.0.6' v1.0.6
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 4 Feb 2016 19:26:48 +0000 (14:26 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 4 Feb 2016 19:26:48 +0000 (14:26 -0500)
commit238f5ed58040a9248a763e5b3cfb915c86dc6a33
tree37c285eb3a22e605903b893d4585d76ccf182faf
parente50484263bb56d084c6de7f3d602b68dce040aad
parente8f6bcbf8d63f986e179970eb85b59a98923bdfc
Merge branch 'hotfix/1.0.6'