Merge branch 'master' of ssh://git@git.grml.org/grml-infrastructure
authorMichael Prokop <mika@grml.org>
Thu, 22 Oct 2009 08:53:07 +0000 (10:53 +0200)
committerMichael Prokop <mika@grml.org>
Thu, 22 Oct 2009 08:53:07 +0000 (10:53 +0200)
commit49841dead5f3ada04899b4120d302f36f2a56afc
tree2e490c66debc5aae0187843e866a8620a0b91da5
parenta0a058a19e47dbcecb52cb436f3c3841c30e977d
parentb3bce19e95790c05365ba9ba0709d8d5acea04b2
Merge branch 'master' of ssh://git@git.grml.org/grml-infrastructure