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

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

f3151e107357cdaa7c781d5843e77cc0edaf7060