Merge branch 'master' of ssh://git.grml.org/grml-live
authorMichael Prokop <mika@grml.org>
Fri, 1 Oct 2010 13:48:49 +0000 (15:48 +0200)
committerMichael Prokop <mika@grml.org>
Fri, 1 Oct 2010 13:48:49 +0000 (15:48 +0200)
commit0752ec6c360284452ed86fbd8649ad654c9158cc
tree2d6ed4a1cdb6347ce2d088ab6790e9c9a445eafa
parent58a29c5b64acb0a39d08bdb854dd23b090d1a418
parentf4d8e7218294e0ea511476c3929d9309f04e971c
Merge branch 'master' of ssh://git.grml.org/grml-live