Merge branch 'win32'
authorClifford Wolf <clifford@clifford.at>
Tue, 14 Oct 2014 23:20:14 +0000 (01:20 +0200)
committerClifford Wolf <clifford@clifford.at>
Tue, 14 Oct 2014 23:20:14 +0000 (01:20 +0200)
commit8cea352a6aafa80d397d8a6a7d195c1378dcb324
treecc670a0dadca8f6df7a1d24e1f00fa649d40f29a
parent2873a8444ee5dbd0a3d034fb4a7a877c680be45d
parent1fc6208ec05af672c7c6b7973b0eba1295bca5f4
Merge branch 'win32'