Merge branch 'master' into patch-1
[grml.org.git] / kantan /
2011-11-07 Michael Prokopinitial import