From: Daniel Martí <mvdan@mvdan.cc>
Date: Fri, 11 Mar 2016 23:53:25 +0000 (+0000)
Subject: Merge branch 'master' into 'master'
X-Git-Tag: 0.7.0~85
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=fdroidserver.git;a=commitdiff_plain;h=fc0746712d86c1474889cf70a4bb999d53edc663

Merge branch 'master' into 'master'

makebuildserver: support running VirtualBox in a VM

For debian.jenkins.net, our test environment is a kvm instance that does not expose the hardware virtualization instructions.  So this auto-detects whether the current machine, virtual or not, supports the hardware virtualization.  If not, it uses VirtualBox's software emulator, which should run everywhere, even in a kvm instance.

See merge request !108
---

fc0746712d86c1474889cf70a4bb999d53edc663