Merge branch 'debian' of git://live.debian.net/git/live-boot into debian
authorChristian Hofstaedtler <ch@grml.org>
Tue, 19 Apr 2011 17:14:54 +0000 (19:14 +0200)
committerChristian Hofstaedtler <ch@grml.org>
Tue, 19 Apr 2011 17:14:54 +0000 (19:14 +0200)
commitb3648df585c66e00515f9d5bd8e9c87df33735cf
treeb6380f918dac2bcd77e1ec25c6a54297d7df7632
parentc31ce7424e1ed479662e4f2bc959d89e874cb809
parent8f1c52f198d4f59482d74cf6efc4029173ae1c34
Merge branch 'debian' of git://live.debian.net/git/live-boot into debian