Merge branch 'ctrl' of https://github.com/dechamps/tinc into 1.1
authorGuus Sliepen <guus@tinc-vpn.org>
Sat, 12 Jul 2014 20:21:01 +0000 (22:21 +0200)
committerGuus Sliepen <guus@tinc-vpn.org>
Sat, 12 Jul 2014 20:21:01 +0000 (22:21 +0200)

Trivial merge