Merge branch 'master' into 1.1

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

Sat, 14 Jul 2012 13:13:21 +0000 (15:13 +0200)

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

Sat, 14 Jul 2012 13:13:21 +0000 (15:13 +0200)
author Guus Sliepen <guus@tinc-vpn.org>
Sat, 14 Jul 2012 13:13:21 +0000 (15:13 +0200)
committer Guus Sliepen <guus@tinc-vpn.org>
Sat, 14 Jul 2012 13:13:21 +0000 (15:13 +0200)
diff --cc THANKS
Simple merge
diff --cc doc/tinc.texi
Simple merge
diff --cc src/bsd/device.c
Simple merge
author	Guus Sliepen <guus@tinc-vpn.org>
	Sat, 14 Jul 2012 13:13:21 +0000 (15:13 +0200)
committer	Guus Sliepen <guus@tinc-vpn.org>
	Sat, 14 Jul 2012 13:13:21 +0000 (15:13 +0200)
		1	2
THANKS	patch \|	diff1 \|	diff2 \|	blob \| history
doc/tinc.texi	patch \|	diff1 \|	diff2 \|	blob \| history
src/bsd/device.c	patch \|	diff1 \|	diff2 \|	blob \| history