From: Stefan Kögl <stefan@skoegl.net>
Date: Sun, 16 Jun 2013 14:48:38 +0000 (+0200)
Subject: Merge branch 'master' into category-db
X-Git-Url: https://repo.or.cz/w/mygpo.git/commitdiff_plain/fa157a9c90aa88d83ee38befa1b0970882e0560d

Merge branch 'master' into category-db
---

fa157a9c90aa88d83ee38befa1b0970882e0560d