Merge branch 'hotfix/1.0.6' v1.0.6
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 13 Oct 2016 14:56:05 +0000 (10:56 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 13 Oct 2016 14:56:05 +0000 (10:56 -0400)
commit45a95b53dfe177686346f2542973eb51be93a9e4
tree48447510dc82009f68c10739ee66a9e45b764003
parent3dcd648edb6674fd147444ec9f6cb3ccdeb20ad8
parent2c30b5802434cd9387a750f0c86cbcaecce4d969
Merge branch 'hotfix/1.0.6'