From: Daniel Martí <mvdan@mvdan.cc>
Date: Fri, 12 Feb 2016 09:13:53 +0000 (+0000)
Subject: Merge branch 'master' into 'master'
X-Git-Tag: 0.6.0~11
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c2270f843403cf3b409a55b57f3fd6e004aaac8d;p=fdroidserver.git

Merge branch 'master' into 'master'

a couple fixes

these are three fixes, one related to my previous merge request, as discussed with @mvdan in IRC

See merge request !99
---

c2270f843403cf3b409a55b57f3fd6e004aaac8d