From: Daniel Martí <mvdan@mvdan.cc>
Date: Fri, 31 Jan 2014 08:14:03 +0000 (+0100)
Subject: Merge branch 'master' into logging
X-Git-Tag: 0.2~339
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8b26f4b319e2a76d9231db6a9d2b7970e927d0d6;p=fdroidserver.git

Merge branch 'master' into logging
---

8b26f4b319e2a76d9231db6a9d2b7970e927d0d6