From: Ivo Ugrina <ivo@iugrina.com>
Date: Mon, 26 Sep 2011 10:29:39 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Tag: 0.1~1284
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=fd877d0d39dd1e245b44dce81876e40a46281d4a;p=fdroidserver.git

Merge remote branch 'upstream/master'
---

fd877d0d39dd1e245b44dce81876e40a46281d4a