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

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

f1556b05530487d5e05a72b9f56d671149ec42b2