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