From: Tovok7 <Tovok7@gmx.de>
Date: Tue, 10 Jan 2012 20:13:41 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: 0.1~1080^2~23
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a2a0d9f4df13858f049f26f9e376594c3eec728f;p=fdroidserver.git

Merge remote-tracking branch 'upstream/master'
---

a2a0d9f4df13858f049f26f9e376594c3eec728f