Merge branch 'feature/torify-dns' into old-master

author intrigeri <intrigeri@boum.org>

Sun, 11 Nov 2012 22:12:47 +0000 (23:12 +0100)

committer intrigeri <intrigeri@boum.org>

Sun, 11 Nov 2012 22:12:47 +0000 (23:12 +0100)
author intrigeri <intrigeri@boum.org>
Sun, 11 Nov 2012 22:12:47 +0000 (23:12 +0100)
committer intrigeri <intrigeri@boum.org>
Sun, 11 Nov 2012 22:12:47 +0000 (23:12 +0100)
diff --cc README
Simple merge
diff --cc manifests/init.pp
Simple merge
author	intrigeri <intrigeri@boum.org>
	Sun, 11 Nov 2012 22:12:47 +0000 (23:12 +0100)
committer	intrigeri <intrigeri@boum.org>
	Sun, 11 Nov 2012 22:12:47 +0000 (23:12 +0100)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
manifests/init.pp	patch \|	diff1 \|	diff2 \|	blob \| history