From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Sun, 23 Jan 2011 21:26:32 +0000 (+0000)
Subject: Merge integration branch
X-Git-Tag: 0.1~1520
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=bd07f3e7308d72cec782b8a2a913b8542523edd0;p=fdroidserver.git

Merge integration branch
---

bd07f3e7308d72cec782b8a2a913b8542523edd0