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

Merge remote branch 'upstream/master'
---

1579ca76bad785aaf2f7f500e36da362bee40b22