Merge upsteam commits and remove VS induced tabs

This commit is contained in:
Trevor Welsby 2016-01-22 15:31:54 +10:00
parent 6dec1d2dc7
commit 304ccdbce1
3 changed files with 114 additions and 114 deletions