From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Tue, 30 Dec 2014 22:48:58 +0000 (+0000)
Subject: Merge branch 'doc-update-v1' into 'master'
X-Git-Tag: 0.3.0~5
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0360e96d4d38b782a831c89ea1dc983829460101;p=fdroidserver.git

Merge branch 'doc-update-v1' into 'master'

Update documentation re: testing32 image

Use different subsections for the Debian base box setup (which can be bypassed using the prebuilt image) and the F-Droid / SDK setup (which cannot be bypassed).

Side note: would it be possible to offer a torrent for testing32.box?  The direct download is taking over 2 hours on a 50Mbps link.

See merge request !32
---

0360e96d4d38b782a831c89ea1dc983829460101