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

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

39333de52457871022df0b2ed6d88f59152c6082