From: Torsten Grote <t@grobox.de>
Date: Mon, 9 Jan 2012 13:09:05 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: 0.1~1080^2~27
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5b11bcd3908f309afaaa0e23375ba704721a7598;p=fdroidserver.git

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

5b11bcd3908f309afaaa0e23375ba704721a7598