From: Evgeni Golov <evgeni@grml.org>
Date: Wed, 10 Dec 2014 11:35:00 +0000 (+0100)
Subject: Merge remote-tracking branch 'live-systems/debian' into debian
X-Git-Tag: debian/1%20151213+grml.1~7^2~2
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=6b123988267c263a2b12a43c9e9d2c9ff60104ba;hp=6b123988267c263a2b12a43c9e9d2c9ff60104ba;p=live-boot-grml.git

Merge remote-tracking branch 'live-systems/debian' into debian
---