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)
commit54fd228e696acc9d78a17845402640cc04e2c54c
tree531518fbd521a65eaae3e45e5362bfdc5ae352e0
parent53036a58790168e18f524bd923f9a7d34691ba2d
parent14be1d30ec3727906907dad49d3bcb868c19d777
Merge branch 'ctrl' of https://github.com/dechamps/tinc into 1.1