Merge branch 'master' of ssh://git.grml.org/grml-live
authorMichael Prokop <mika@grml.org>
Wed, 4 Aug 2010 03:29:36 +0000 (23:29 -0400)
committerMichael Prokop <mika@grml.org>
Wed, 4 Aug 2010 03:29:36 +0000 (23:29 -0400)
commit2694bdda875ec9949e1d190240fe7fa6958b10df
treeb72eeb387ea515eb6db0fd01bef96e5d72319b69
parent9f059faf8aa6aaddd527ab1a3cd1892c631823f4
parent916808e48a37fa25a041e4b10b2cb682be9f824a
Merge branch 'master' of ssh://git.grml.org/grml-live