From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Tue, 7 Feb 2017 13:27:56 +0000 (+0000)
Subject: Merge branch 'fix-build-and-vlc' into 'master'
X-Git-Tag: 0.8~129
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=70c347264cfb3f979cadb60a06481e878314acec;p=fdroidserver.git

Merge branch 'fix-build-and-vlc' into 'master'

fix CI, makebuildserver, and VLC build

See merge request !204
---

70c347264cfb3f979cadb60a06481e878314acec