Merge remote-tracking branch 'dechamps/wintapver' into 1.1
authorGuus Sliepen <guus@tinc-vpn.org>
Sun, 12 Apr 2015 13:43:05 +0000 (15:43 +0200)
committerGuus Sliepen <guus@tinc-vpn.org>
Sun, 12 Apr 2015 13:43:05 +0000 (15:43 +0200)
1  2 
src/mingw/device.c

Simple merge