Merge branch 'master' into category-db
authorStefan Kögl <stefan@skoegl.net>
Sun, 16 Jun 2013 14:48:38 +0000 (16 16:48 +0200)
committerStefan Kögl <stefan@skoegl.net>
Sun, 16 Jun 2013 14:48:38 +0000 (16 16:48 +0200)

Trivial merge