From: Daniel Martí <mvdan@mvdan.cc>
Date: Sat, 2 Nov 2013 18:56:31 +0000 (+0100)
Subject: Merge branch 'master' into verbose-rewrite
X-Git-Tag: 0.1~242
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=67b88255603a707b7e2d646297b385b771ea74d7;p=fdroidserver.git

Merge branch 'master' into verbose-rewrite
---

67b88255603a707b7e2d646297b385b771ea74d7