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