From: Michael Prokop Date: Fri, 1 Oct 2010 13:48:49 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.grml.org/grml-live X-Git-Tag: v0.12.0~38 X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=0752ec6c360284452ed86fbd8649ad654c9158cc;hp=-c Merge branch 'master' of ssh://git.grml.org/grml-live --- 0752ec6c360284452ed86fbd8649ad654c9158cc