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

Merge remote branch 'upstream/master'
---

2a7396882831bdf78afc17da81333a58d067c3df