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)

Trivial merge