From: Michael Prokop Date: Sun, 1 Nov 2009 16:45:28 +0000 (+0100) Subject: Merge branch 'master' of ssh://git@git.grml.org/grml-live X-Git-Tag: v0.9.30~1 X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=27a3d5320ebfddf05770d111faa90d83f04f5a4c;hp=bffd25759e54749d5d67852644725301757905e1 Merge branch 'master' of ssh://git@git.grml.org/grml-live ---