From: Hans-Christoph Steiner <hans@guardianproject.info>
Date: Wed, 20 Sep 2017 15:24:57 +0000 (+0000)
Subject: Merge branch 'port-to-osx-and-trusty' into 'master'
X-Git-Tag: 0.9~74
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ca069d941dfa956672410bc8561c5051028e2b7e;p=fdroidserver.git

Merge branch 'port-to-osx-and-trusty' into 'master'

port to OSX and Ubuntu/trusty

See merge request fdroid/fdroidserver!341
---

ca069d941dfa956672410bc8561c5051028e2b7e