Merge branch 'some-compatibility-fixes' of https://gitlab.com/eighthave/fdroidserver

author Daniel Martí <mvdan@mvdan.cc>

Mon, 27 Jul 2015 17:41:23 +0000 (10:41 -0700)

committer Daniel Martí <mvdan@mvdan.cc>

Mon, 27 Jul 2015 17:41:23 +0000 (10:41 -0700)
author Daniel Martí <mvdan@mvdan.cc>
Mon, 27 Jul 2015 17:41:23 +0000 (10:41 -0700)
committer Daniel Martí <mvdan@mvdan.cc>
Mon, 27 Jul 2015 17:41:23 +0000 (10:41 -0700)
diff --cc fdroidserver/build.py
Simple merge
diff --cc fdroidserver/common.py
Simple merge
author	Daniel Martí <mvdan@mvdan.cc>
	Mon, 27 Jul 2015 17:41:23 +0000 (10:41 -0700)
committer	Daniel Martí <mvdan@mvdan.cc>
	Mon, 27 Jul 2015 17:41:23 +0000 (10:41 -0700)
		1	2
fdroidserver/build.py	patch \|	diff1 \|	diff2 \|	blob \| history
fdroidserver/common.py	patch \|	diff1 \|	diff2 \|	blob \| history