Merge branch 'master' of ssh://git@git.grml.org/grml-infrastructure v2009.10
authorMichael Prokop <mika@grml.org>
Fri, 30 Oct 2009 21:13:05 +0000 (22:13 +0100)
committerMichael Prokop <mika@grml.org>
Fri, 30 Oct 2009 21:13:05 +0000 (22:13 +0100)
commit15c63c4b3a963f9a84e87393584995839a2b15c7
treee0de1f41039607565c9b1f72067f7476739645e3
parentcad3c1264b1fce028980649f44eb586d10be1d6d
parent4a2a94977d88792fed76ce0238456c845ba87970
Merge branch 'master' of ssh://git@git.grml.org/grml-infrastructure