Merge branch 'hotfix/1.0.6' v1.0.6
authorIan Weller <ian@gaslightmedia.com>
Tue, 27 Dec 2016 20:18:07 +0000 (15:18 -0500)
committerIan Weller <ian@gaslightmedia.com>
Tue, 27 Dec 2016 20:18:07 +0000 (15:18 -0500)
commit6a63448f726551c80ae7d03bf7c2960e97095326
tree973b300dc8c0e34a0cb7b22841ae02fe4ccf504b
parent71948b22ed556eb6726c8c1b4beee640d9319725
parentc2fa1ccfe0b9b3084ad76a91c9ba078dc21307fd
Merge branch 'hotfix/1.0.6'