Merge branch 'master' of git://git.grml.org/grml-infrastructure
authorAlexander Wirt <formorer@grml.org>
Thu, 22 Oct 2009 07:29:28 +0000 (09:29 +0200)
committerAlexander Wirt <formorer@grml.org>
Thu, 22 Oct 2009 07:29:28 +0000 (09:29 +0200)
commit00e96275ab239ad6d9ec24da215b7796b3aad4cd
treea87acb87e68731a16aa264af3dddf8cf43914a9b
parentaf6853942d43342a2071ac0d7022c392c0aa2fb8
parent0131618904052be5afbd0e1b13e8a25b3dbfb963
Merge branch 'master' of git://git.grml.org/grml-infrastructure