Merge branch 'master' of linz:/srv/git/themes
authorRobert Kaiser <kairo@kairo.at>
Sun, 9 Dec 2012 21:21:18 +0000 (22:21 +0100)
committerRobert Kaiser <kairo@kairo.at>
Sun, 9 Dec 2012 21:21:18 +0000 (22:21 +0100)

Trivial merge