From: David Black <david8black@gmail.com>
Date: Sat, 15 Dec 2012 15:29:21 +0000 (+0000)
Subject: Merge branch 'master' of git://gitorious.org/f-droid/fdroidserver
X-Git-Tag: 0.1~706^2~4
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ed78943692420b6a3928ce15e398f64afc202d41;p=fdroidserver.git

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

ed78943692420b6a3928ce15e398f64afc202d41