From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sat, 12 Jul 2014 20:21:01 +0000 (+0200)
Subject: Merge branch 'ctrl' of https://github.com/dechamps/tinc into 1.1
X-Git-Tag: release-1.1pre11~62
X-Git-Url: https://tinc-vpn.org/git/browse?a=commitdiff_plain;h=54fd228e696acc9d78a17845402640cc04e2c54c;p=tinc

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

54fd228e696acc9d78a17845402640cc04e2c54c