From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Fri, 20 Jan 2012 23:26:04 +0000 (+0000)
Subject: Merge commit '82f88887'
X-Git-Tag: 0.1~1082
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d6b08552185a51efe38e7e30291bcfa3b5e99521;p=fdroidserver.git

Merge commit '82f88887'

Conflicts:
	metadata/com.morphoss.acal.txt
---

d6b08552185a51efe38e7e30291bcfa3b5e99521