From: Hans-Christoph Steiner <hans@guardianproject.info>
Date: Mon, 27 Jun 2016 18:48:19 +0000 (+0000)
Subject: Merge branch 'java8-and-other-fixes' into 'master'
X-Git-Tag: 0.7.0~40
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=fdroidserver.git;a=commitdiff_plain;h=8691bd9cf9cd95faaca2b492a0dbc2635dd3cceb

Merge branch 'java8-and-other-fixes' into 'master'

Java8 and other fixes

This fixes the OSX travis-ci job for the Java8 update, and also two other fixes as described in the commit message.  @CiaranG I think the _/etc/profile_ approach in 7b466b6266a466a954c845968271283ad60e43ea gets us closer to the idea of having the `fdroid build` jobs run in the same environment as `vagrant ssh`.

See merge request !138
---

8691bd9cf9cd95faaca2b492a0dbc2635dd3cceb