From: Evgeni Golov <evgeni@grml.org>
Date: Wed, 10 Dec 2014 11:39:52 +0000 (+0100)
Subject: Merge remote-tracking branch 'grml/master'
X-Git-Tag: debian/5.0_a4-1+grml.1~30
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=17381f923755faece25b43771545c5fa8cedcefc;hp=17381f923755faece25b43771545c5fa8cedcefc;p=live-boot-grml.git

Merge remote-tracking branch 'grml/master'

Conflicts:
	debian/changelog
---