From: Daniel Martí <mvdan@mvdan.cc>
Date: Fri, 11 Sep 2015 00:23:42 +0000 (+0000)
Subject: Merge branch 'import-tweaks-and-tests' into 'master'
X-Git-Tag: 0.5.0~116
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=13b5966062435e9690981a6306e65504d686a45b;p=fdroidserver.git

Merge branch 'import-tweaks-and-tests' into 'master'

Import tweaks and tests

This makes the code for `fdroid import` a bit more flexible and adds tests for the first time.  It also comments out options in `examples/config.py` that just mirror the defaults to make it clear that they are defaults, and help illustrate other options (this is standard procedure in default config files).

More details in the commit messages.

See merge request !76
---

13b5966062435e9690981a6306e65504d686a45b