From: Tovok7 <Tovok7@gmx.de>
Date: Thu, 12 Jan 2012 00:26:22 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: 0.1~1080^2~17
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=7a7aba1784e0162be6d036598b39d53e2b49f47b;p=fdroidserver.git

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

7a7aba1784e0162be6d036598b39d53e2b49f47b