From: Daniel Martí <mvdan@mvdan.cc>
Date: Tue, 25 Oct 2016 11:06:47 +0000 (+0000)
Subject: Merge branch 'updates' into 'master'
X-Git-Tag: 0.8~153
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=559f38cd218b857164ddba835828cfd52637b4e5;p=fdroidserver.git

Merge branch 'updates' into 'master'

makebs and CI updates

See merge request !178
---

559f38cd218b857164ddba835828cfd52637b4e5