Merge branch 'bug-fixes-for-v0.2.1' of https://gitlab.com/eighthave/fdroidserver

author Daniel Martí <mvdan@mvdan.cc>

Tue, 1 Jul 2014 16:13:00 +0000 (18:13 +0200)

committer Daniel Martí <mvdan@mvdan.cc>

Tue, 1 Jul 2014 16:13:00 +0000 (18:13 +0200)
author Daniel Martí <mvdan@mvdan.cc>
Tue, 1 Jul 2014 16:13:00 +0000 (18:13 +0200)
committer Daniel Martí <mvdan@mvdan.cc>
Tue, 1 Jul 2014 16:13:00 +0000 (18:13 +0200)
diff --cc fdroidserver/common.py
Simple merge
diff --cc fdroidserver/update.py
Simple merge
author	Daniel Martí <mvdan@mvdan.cc>
	Tue, 1 Jul 2014 16:13:00 +0000 (18:13 +0200)
committer	Daniel Martí <mvdan@mvdan.cc>
	Tue, 1 Jul 2014 16:13:00 +0000 (18:13 +0200)
		1	2
fdroidserver/common.py	patch \|	diff1 \|	diff2 \|	blob \| history
fdroidserver/update.py	patch \|	diff1 \|	diff2 \|	blob \| history