From: Hans-Christoph Steiner <hans@guardianproject.info>
Date: Sat, 21 Jan 2017 21:34:33 +0000 (+0000)
Subject: Merge branch 'collection-of-fixes' into 'master'
X-Git-Tag: 0.8~131
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1993cc874d22b99c3e2300d3a6487e805548e786;p=fdroidserver.git

Merge branch 'collection-of-fixes' into 'master'

include fdroidserverid in build log post on wiki

See merge request !201
---

1993cc874d22b99c3e2300d3a6487e805548e786