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)

Trivial merge