From: Hans-Emil Skogh <hansemil@gmail.com>
Date: Mon, 23 Jan 2012 20:23:52 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Tag: 0.1~1063^2~2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=e135fbc5d79be118993ca28c0172f9c34f6dcb39;p=fdroidserver.git

Merge branch 'dev'
---

e135fbc5d79be118993ca28c0172f9c34f6dcb39