Merge remote branch 'grml-scripts/master'
authorUlrich Dangel <mru@grml.org>
Mon, 18 Apr 2011 20:47:20 +0000 (22:47 +0200)
committerUlrich Dangel <mru@grml.org>
Mon, 18 Apr 2011 20:47:20 +0000 (22:47 +0200)
commit1b8dcad8b9da618cb6c0e22a762cafb08e262640
tree9bacbe289db27bfb0d2b709b524037aee8b9f315
parent608ca3eeeacd74efa85ad44f5585d1b1b60c8d85
parent6fb922ca4bc798b9b4b53cb8d2b8df337a51ae63
Merge remote branch 'grml-scripts/master'