From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Wed, 21 Jan 2015 16:30:43 +0000 (+0000)
Subject: Merge branch 'master' into 'master'
X-Git-Tag: 0.4.0~132
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=7fdddb729e2a364d0c76f8582a6e8e4c4b83eeb1;p=fdroidserver.git

Merge branch 'master' into 'master'

fix build issues

Fixed three build issues: one PEP8 and two small errors in the tests.

See merge request !39
---

7fdddb729e2a364d0c76f8582a6e8e4c4b83eeb1