Merge branch 'master' of ssh://git.grml.org/grml.org
authorMichael Prokop <mika@grml.org>
Fri, 23 Dec 2011 12:32:40 +0000 (13:32 +0100)
committerMichael Prokop <mika@grml.org>
Fri, 23 Dec 2011 12:32:40 +0000 (13:32 +0100)

Trivial merge