Merge branch 'master' of https://github.com/jimmy42/grml2usb
authorMichael Prokop <mika@grml.org>
Thu, 3 Jul 2014 10:08:26 +0000 (12:08 +0200)
committerMichael Prokop <mika@grml.org>
Thu, 3 Jul 2014 10:08:26 +0000 (12:08 +0200)

Trivial merge