Merge remote-tracking branch 'debian/debian' into ch/new_version
authorChristian Hofstaedtler <ch@grml.org>
Sun, 24 Jul 2011 19:57:36 +0000 (21:57 +0200)
committerChristian Hofstaedtler <ch@grml.org>
Sun, 24 Jul 2011 19:57:36 +0000 (21:57 +0200)
commit8cd0e7a9e961e73abe47b0d5c11d3c3a9cbdf802
tree6e71607acf5b2851d0c8c4703731b261308140b4
parentec72422e74e8e863cf8962ef1fe530180ed21afa
parent70f23ec84f4046850939961014cdf19dba5bd1f3
Merge remote-tracking branch 'debian/debian' into ch/new_version

Conflicts:
Makefile
debian/changelog
debian/control
debian/rules
Makefile
debian/changelog
debian/control
debian/live-boot-grml-doc.install
debian/live-boot-grml.init
debian/live-boot-grml.install
debian/rules