From: Daniel Martí <mvdan@mvdan.cc>
Date: Sat, 17 Dec 2016 23:19:50 +0000 (+0000)
Subject: Merge branch 'master' into 'master'
X-Git-Tag: 0.8~139
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=87c326c401dee07c582ccd78b04ba8a768749775;p=fdroidserver.git

Merge branch 'master' into 'master'

Makebs: add build tools 25.0.2

See merge request !195
---

87c326c401dee07c582ccd78b04ba8a768749775