Merge branch 'keysegfault' of https://github.com/dechamps/tinc into 1.1
authorGuus Sliepen <guus@tinc-vpn.org>
Sat, 12 Jul 2014 20:25:55 +0000 (22:25 +0200)
committerGuus Sliepen <guus@tinc-vpn.org>
Sat, 12 Jul 2014 20:25:55 +0000 (22:25 +0200)
commit19e42b76f546dc3baee4a5d6a4f161155d279c74
tree94aa8f544149ca2f9ed1ea9594781648319af45a
parentf704304823df0ac868786ac89355eda38592dc3f
parentb12f122f1be89b49d8a3e39fb1b10c6e4d3ada94
Merge branch 'keysegfault' of https://github.com/dechamps/tinc into 1.1