Merge branch 'master' of ssh://git@git.grml.org/grml-live
authorMichael Prokop <mika@grml.org>
Sun, 1 Nov 2009 16:45:28 +0000 (17:45 +0100)
committerMichael Prokop <mika@grml.org>
Sun, 1 Nov 2009 16:45:28 +0000 (17:45 +0100)
commit27a3d5320ebfddf05770d111faa90d83f04f5a4c
tree830c8dfaac6721eed8f70d70a9f3bdf1bc15dfe0
parentbffd25759e54749d5d67852644725301757905e1
parent71846d11e35623f022974f1c8980471bff411e58
Merge branch 'master' of ssh://git@git.grml.org/grml-live