From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Tue, 6 May 2014 16:14:20 +0000 (+0000)
Subject: Merge branch 'master' into 'master'
X-Git-Tag: 0.2~89
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ae3d1b036f1f777a477d1996b55e722b80444e72;p=fdroidserver.git

Merge branch 'master' into 'master'

fix pyflakes error and a bunch of PEP8 fixes

lots of little fixes here, the first commit fixes the minor error that `pyflakes` raised, then the rest are all PEP8 fixes, as reported by the `pep8` command line tool.
---

ae3d1b036f1f777a477d1996b55e722b80444e72