Merge branch 'nonophp' of github.com:formorer/grml.org into nonophp
authorAlexander Wirt <formorer@debian.org>
Fri, 6 Jan 2012 21:50:29 +0000 (22:50 +0100)
committerAlexander Wirt <formorer@debian.org>
Fri, 6 Jan 2012 21:50:29 +0000 (22:50 +0100)

Trivial merge