Merge branch 'master' of git://git.grml.org/grml-infrastructure