From: Ivo Ugrina <ivo@iugrina.com>
Date: Tue, 4 Oct 2011 21:45:23 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Tag: 0.1~1263^2~8
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=4ed05b4666dc31ceb39bebc9afd50d5226fd79a8;p=fdroidserver.git

Merge remote branch 'upstream/master'
---

4ed05b4666dc31ceb39bebc9afd50d5226fd79a8