Merge branch 'hotfix/1.0.6' v1.0.6
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 7 Feb 2017 19:54:34 +0000 (14:54 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 7 Feb 2017 19:54:34 +0000 (14:54 -0500)
commit345e211507e16cc9c14432883ebdecb2464c979a
tree3d18f81c18ebdea2234c299633b473a31ddf669d
parentc5812dbd93ea67382de4221c28e48e7f8ec2e0d5
parent6681595e0833f82241823edfbea64795ecc9e986
Merge branch 'hotfix/1.0.6'