Merge branch 'master' into 1.1

author Guus Sliepen <guus@tinc-vpn.org>

Fri, 27 Jul 2012 20:48:24 +0000 (22:48 +0200)

committer Guus Sliepen <guus@tinc-vpn.org>

Fri, 27 Jul 2012 20:48:24 +0000 (22:48 +0200)
author Guus Sliepen <guus@tinc-vpn.org>
Fri, 27 Jul 2012 20:48:24 +0000 (22:48 +0200)
committer Guus Sliepen <guus@tinc-vpn.org>
Fri, 27 Jul 2012 20:48:24 +0000 (22:48 +0200)
diff --cc THANKS
Simple merge
diff --cc doc/tinc.conf.5.in
Simple merge
diff --cc doc/tinc.texi
Simple merge
author	Guus Sliepen <guus@tinc-vpn.org>
	Fri, 27 Jul 2012 20:48:24 +0000 (22:48 +0200)
committer	Guus Sliepen <guus@tinc-vpn.org>
	Fri, 27 Jul 2012 20:48:24 +0000 (22:48 +0200)
		1	2
THANKS	patch \|	diff1 \|	diff2 \|	blob \| history
doc/tinc.conf.5.in	patch \|	diff1 \|	diff2 \|	blob \| history
doc/tinc.texi	patch \|	diff1 \|	diff2 \|	blob \| history