Merge branch 'hotfix/1.0.6' v1.0.6
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 23 Feb 2016 21:15:40 +0000 (16:15 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 23 Feb 2016 21:15:40 +0000 (16:15 -0500)
commitb347b11a702d19afcff631c6fdbee46bccc26564
tree4a77eda1a84423f1a84ec9de2017cbae9ea6f83e
parentab1874f3c47d3f565276ebe9b3db76b2646a96ec
parent33743ef7da2e53eb35b6a7ed00a0ac8c189f7f21
Merge branch 'hotfix/1.0.6'