Merge branch 'patch-1' of https://github.com/bionix/grml.org into pull-request-1
authorMichael Prokop <mika@grml.org>
Wed, 16 May 2012 23:16:43 +0000 (01:16 +0200)
committerMichael Prokop <mika@grml.org>
Wed, 16 May 2012 23:16:43 +0000 (01:16 +0200)
commitb99fbad72a40f07c7197ffaf58c75d3b4ee22e49
tree286a1e6a3167bb25dda0c693a1a9f094848c1ea0
parenta6e6d23c928be2a310ce6b4d6396c72459934891
parent9c13b030ae6089f1272673588b39c22b79635462
Merge branch 'patch-1' of https://github.com/bionix/grml.org into pull-request-1