Merge branch 'master' of ssh://openpandora.org/srv/git/pandora-misc
authorNils Kneuper <crazy-ivanovic@gmx.net>
Mon, 13 Feb 2012 17:08:04 +0000 (18:08 +0100)
committerNils Kneuper <crazy-ivanovic@gmx.net>
Mon, 13 Feb 2012 17:08:04 +0000 (18:08 +0100)

Trivial merge