From: Christian Hofstaedtler <ch@grml.org>
Date: Sun, 24 Jul 2011 19:57:36 +0000 (+0200)
Subject: Merge remote-tracking branch 'debian/debian' into ch/new_version
X-Git-Tag: v3.0_a19-1+grml.00~1^2~1
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=8cd0e7a9e961e73abe47b0d5c11d3c3a9cbdf802;hp=8cd0e7a9e961e73abe47b0d5c11d3c3a9cbdf802;p=live-boot-grml.git

Merge remote-tracking branch 'debian/debian' into ch/new_version

Conflicts:
	Makefile
	debian/changelog
	debian/control
	debian/rules
---