From: Daniel Martí <mvdan@mvdan.cc>
Date: Sun, 3 Nov 2013 10:53:36 +0000 (+0100)
Subject: Merge branch 'master' into verbose-rewrite
X-Git-Tag: 0.1~238
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=223b0ea061f81a157b99bf2c76cebad32e25a8c4;p=fdroidserver.git

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

223b0ea061f81a157b99bf2c76cebad32e25a8c4