Merge branch 'hotfix/1.0.6' v1.0.6
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 14 Jan 2016 21:44:49 +0000 (16:44 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 14 Jan 2016 21:44:49 +0000 (16:44 -0500)
commit3779e9b51f08a82ba52596d77d04f6b9a971f4f2
tree364ca2637e28a53e5c8144d62842e778646272a1
parent4f1eb59387bfda885b6b976554ee4c6c7ad424f3
parentbbe3318a13106e601ce6c0526d360290212d490a
Merge branch 'hotfix/1.0.6'