From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sat, 12 Jul 2014 20:19:45 +0000 (+0200)
Subject: Merge branch 'winwarnings' of https://github.com/dechamps/tinc into 1.1
X-Git-Tag: release-1.1pre11~63
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=53036a58790168e18f524bd923f9a7d34691ba2d;p=oweals%2Ftinc.git

Merge branch 'winwarnings' of https://github.com/dechamps/tinc into 1.1
---

53036a58790168e18f524bd923f9a7d34691ba2d