From: Alexander Wirt <formorer@grml.org>
Date: Wed, 11 Jan 2012 14:17:44 +0000 (+0100)
Subject: Merge branch 'master' of git.grml.org:grml-tips
X-Git-Tag: v0.6.2~4
X-Git-Url: http://git.grml.org/?p=grml-tips.git;a=commitdiff_plain;h=3bd6d677c1f9a06839ef21786eb52b570a8d430b

Merge branch 'master' of git.grml.org:grml-tips
---

3bd6d677c1f9a06839ef21786eb52b570a8d430b