From: Michael Prokop <mika@grml.org>
Date: Sun, 18 Oct 2009 22:48:30 +0000 (+0200)
Subject: Fix merge conflicts
X-Git-Tag: v0.9.13~30
X-Git-Url: https://git.grml.org/?p=grml2usb.git;a=commitdiff_plain;h=abe68338ee0a37eeaccb8dd45c4d9c0b1a18d4ca;hp=abe68338ee0a37eeaccb8dd45c4d9c0b1a18d4ca

Fix merge conflicts
---