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

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

185c31a7b0e557651218562b7be4451b081acc74