Merge branch 'master' of linz:/srv/git/themes
authorRobert Kaiser <kairo@kairo.at>
Wed, 15 Aug 2012 18:55:02 +0000 (20:55 +0200)
committerRobert Kaiser <kairo@kairo.at>
Wed, 15 Aug 2012 18:55:02 +0000 (20:55 +0200)

Trivial merge