Merge remote-tracking branch 'dechamps/winmtu' into 1.1
authorGuus Sliepen <guus@tinc-vpn.org>
Sun, 12 Apr 2015 13:35:50 +0000 (15:35 +0200)
committerGuus Sliepen <guus@tinc-vpn.org>
Sun, 12 Apr 2015 13:35:50 +0000 (15:35 +0200)

Trivial merge