From: Michael Prokop <mika@grml.org>
Date: Sat, 24 Oct 2009 12:27:07 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git@git.grml.org/grml2usb
X-Git-Tag: v0.9.14~1
X-Git-Url: https://git.grml.org/?p=grml2usb.git;a=commitdiff_plain;h=863f75014eac9dc7ba1bc5711080e9ded5602b93

Merge branch 'master' of ssh://git@git.grml.org/grml2usb
---

863f75014eac9dc7ba1bc5711080e9ded5602b93