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

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

475517c3a0a19e38c6334097435530b6e6b20493