From: Hans-Emil Skogh <hansemil@gmail.com>
Date: Sat, 14 Jan 2012 11:10:49 +0000 (+0100)
Subject: Merge remote branch 'origin/master'
X-Git-Tag: 0.1~1063^2~11
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=bd136134e18c5e4302afa65a2c72434073cbcd03;p=fdroidserver.git

Merge remote branch 'origin/master'
---

bd136134e18c5e4302afa65a2c72434073cbcd03