From: David Black <david8black@gmail.com>
Date: Thu, 20 Sep 2012 13:10:29 +0000 (+0100)
Subject: Merge branch 'master' of git://gitorious.org/f-droid/fdroidserver
X-Git-Tag: 0.1~731^2~4
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8640f4da030a2af0dbe0e86a0ab1de864de7947e;p=fdroidserver.git

Merge branch 'master' of git://gitorious.org/f-droid/fdroidserver
---

8640f4da030a2af0dbe0e86a0ab1de864de7947e