Merge branch 'master' of git.grml.org:grml-live
authorAlexander Wirt <formorer@debian.org>
Wed, 28 Dec 2011 20:58:26 +0000 (21:58 +0100)
committerAlexander Wirt <formorer@debian.org>
Wed, 28 Dec 2011 20:58:26 +0000 (21:58 +0100)

Trivial merge