From: Daniel Martí <mvdan@mvdan.cc>
Date: Mon, 14 Mar 2016 12:54:10 +0000 (+0000)
Subject: Merge branch 'master' into 'master'
X-Git-Tag: 0.7.0~83
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c1ac6f4e8880d034521f38930b3c3bc17efc10a2;p=fdroidserver.git

Merge branch 'master' into 'master'

post-py3 fixes

This is a collection of fixes related to running on py3 on various platforms.

See merge request !110
---

c1ac6f4e8880d034521f38930b3c3bc17efc10a2