From: Christian Hofstaedtler <ch@grml.org>
Date: Tue, 6 Dec 2011 21:22:25 +0000 (+0100)
Subject: Merge branch 'debian'
X-Git-Tag: v3.0_a24-1+grml.1~1
X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=11575c6aee0916c918b1e4e98731566d20586df9

Merge branch 'debian'
---

11575c6aee0916c918b1e4e98731566d20586df9