Merge branch 'debian'
authorChristian Hofstaedtler <ch@grml.org>
Tue, 6 Dec 2011 20:40:44 +0000 (21:40 +0100)
committerChristian Hofstaedtler <ch@grml.org>
Tue, 6 Dec 2011 20:40:44 +0000 (21:40 +0100)
commit6ac1aac5fcd96ce1e986e64884bd8c16a7aa9ea8
tree90ebba6bde05d9c66b544515f537187a597754b8
parentd4619b77a669c70ae68d5da34de7655ffef80e04
parent71d86430dfeaacdedfb93dce0984361ad6fb9858
Merge branch 'debian'

Conflicts:
debian/changelog
debian/control
debian/rules
debian/changelog
debian/control
debian/live-boot-grml.init
debian/rules
scripts/live