tree c2a0db3d987bc3e750871a2837c2c9df203567d4
parent 8ad89f057d737ccbc6f411e9ebcf11b8130a50bb
parent 539a610e2e72375e598ab29fd390ed9ec93816d5
author ThePhD <phdofthehouse@gmail.com> 1439528520 -0400
committer ThePhD <phdofthehouse@gmail.com> 1439528520 -0400

Merge branch 'master' into vc++-fixes