From: Evgeni Golov <evgeni@grml.org>
Date: Thu, 28 Aug 2014 15:30:11 +0000 (+0200)
Subject: Merge branch 'debian'
X-Git-Tag: v4.0.0-1+grml.1~1
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=1b428f6013d6ef7c8159d803fee1968e1e758e1f;hp=1b428f6013d6ef7c8159d803fee1968e1e758e1f;p=live-boot-grml.git

Merge branch 'debian'

Conflicts:
	debian/changelog
---