Merge remote-tracking branch 'seehuhn/1.1' into 1.1
authorGuus Sliepen <guus@tinc-vpn.org>
Sat, 14 Mar 2015 11:45:55 +0000 (11:45 +0000)
committerGuus Sliepen <guus@tinc-vpn.org>
Sat, 14 Mar 2015 11:45:55 +0000 (11:45 +0000)
commit04fc19112da5e7fcefefcf6e490987cdcfb6f620
tree398b09473b87c6ee1ed9b13f76b7ff371448f9fb
parentf9ecaa10768926302f24a70975f36e360b51c8ce
parent19d16e40ccfb39461eda5336f4e754e10a640aba
Merge remote-tracking branch 'seehuhn/1.1' into 1.1
src/process.c
src/tincd.c