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)
commit89cdf10f27a3ffcb6846ae5aa5e51cb9e5010738
treef0804fa1afa788e2d68f86f41fa038dfa13dded1
parent6225bfa01f4dfc21710f47372c05e8ed2031480e
parentfb29a094fe3740b430b24d34fef0b2debc883a1f
Merge branch 'master' of git.grml.org:grml-live