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

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

5b613292c3fda06259592d3410e00d79cc7fdff0