From: Daniel Martí <mvdan@mvdan.cc>
Date: Mon, 14 Mar 2016 23:37:51 +0000 (+0000)
Subject: Merge branch 'master' into 'master'
X-Git-Tag: 0.7.0~80
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8041e349573b772a849bf946ef9e4061af2537e9;p=fdroidserver.git

Merge branch 'master' into 'master'

makebuildserver: buildserverid should always be a string

missed one subprocess issue in !110

See merge request !112
---

8041e349573b772a849bf946ef9e4061af2537e9