Merge branch 'nonophp' of github.com:formorer/grml.org into nonophp