Merge branch 'master' of git.grml.org:grml-tips

author Alexander Wirt <formorer@grml.org>

Wed, 11 Jan 2012 14:17:44 +0000 (15:17 +0100)

committer Alexander Wirt <formorer@grml.org>

Wed, 11 Jan 2012 14:17:44 +0000 (15:17 +0100)
author Alexander Wirt <formorer@grml.org>
Wed, 11 Jan 2012 14:17:44 +0000 (15:17 +0100)
committer Alexander Wirt <formorer@grml.org>
Wed, 11 Jan 2012 14:17:44 +0000 (15:17 +0100)
diff --cc debian/postinst
Simple merge
diff --cc debian/rules
Simple merge
author	Alexander Wirt <formorer@grml.org>
	Wed, 11 Jan 2012 14:17:44 +0000 (15:17 +0100)
committer	Alexander Wirt <formorer@grml.org>
	Wed, 11 Jan 2012 14:17:44 +0000 (15:17 +0100)
		1	2
debian/postinst	patch \|	diff1 \|	diff2 \|	blob \| history
debian/rules	patch \|	diff1 \|	diff2 \|	blob \| history