Merge branch 'hotfix/1.0.6' v1.0.6
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Jan 2016 16:34:56 +0000 (11:34 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Jan 2016 16:34:56 +0000 (11:34 -0500)
commit14d5aa7b2444e7e4309dfbb53fa26d2efe2f20ea
treeecbb00bd6a4c5a6e509f8a065df575bc90724879
parent2aed3dd4bef2d51c94d895d08361a758e1b90481
parent1d19a064eb7fc0895e3ef947cb59efe279736134
Merge branch 'hotfix/1.0.6'