Merge branch 'master' of linz:/srv/git/themes
authorRobert Kaiser <kairo@kairo.at>
Thu, 14 Jul 2016 14:13:30 +0000 (16:13 +0200)
committerRobert Kaiser <kairo@kairo.at>
Thu, 14 Jul 2016 14:13:30 +0000 (16:13 +0200)

Trivial merge