From: Michael Pöhn <uniq@h4x.at>
Date: Sat, 2 Dec 2017 12:49:05 +0000 (+0000)
Subject: Merge branch 'no_sleep' into 'master'
X-Git-Tag: 1.0.0~56
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=fdroidserver.git;a=commitdiff_plain;h=68bbfa7e0e96513a879b9862b2fda1ca0a11bceb

Merge branch 'no_sleep' into 'master'

vmtools: remove old vagrant workaround

See merge request fdroid/fdroidserver!380
---

68bbfa7e0e96513a879b9862b2fda1ca0a11bceb