Merge commit 'refs/merge-requests/28' of git://gitorious.org/f-droid/fdroidserver...

author Ciaran Gultnieks <ciaran@ciarang.com>

Mon, 26 Sep 2011 10:12:54 +0000 (11:12 +0100)

committer Ciaran Gultnieks <ciaran@ciarang.com>

Mon, 26 Sep 2011 10:12:54 +0000 (11:12 +0100)
author Ciaran Gultnieks <ciaran@ciarang.com>
Mon, 26 Sep 2011 10:12:54 +0000 (11:12 +0100)
committer Ciaran Gultnieks <ciaran@ciarang.com>
Mon, 26 Sep 2011 10:12:54 +0000 (11:12 +0100)
diff --cc common.py
Simple merge
diff --cc metadata/com.eleybourn.bookcatalogue.txt
Simple merge
diff --cc update.py
Simple merge
author	Ciaran Gultnieks <ciaran@ciarang.com>
	Mon, 26 Sep 2011 10:12:54 +0000 (11:12 +0100)
committer	Ciaran Gultnieks <ciaran@ciarang.com>
	Mon, 26 Sep 2011 10:12:54 +0000 (11:12 +0100)
		1	2
common.py	patch \|	diff1 \|	diff2 \|	blob \| history
metadata/com.eleybourn.bookcatalogue.txt	patch \|	diff1 \|	diff2 \|	blob \| history
update.py	patch \|	diff1 \|	diff2 \|	blob \| history