chiark / gitweb /
Merge branch 'master' into verbose-rewrite
authorDaniel Martí <mvdan@mvdan.cc>
Sun, 3 Nov 2013 13:00:09 +0000 (14:00 +0100)
committerDaniel Martí <mvdan@mvdan.cc>
Sun, 3 Nov 2013 13:00:09 +0000 (14:00 +0100)
commit65e708908e02a09a4cfb506bc2c240d10842caa4
tree4998a7d101ed37ef609e75d2656f4f4a88f0f039
parent223b0ea061f81a157b99bf2c76cebad32e25a8c4
parent962b603a6a8dba442377910f28fd69cc7aaa8197
Merge branch 'master' into verbose-rewrite

Conflicts:
fdroidserver/common.py
fdroidserver/checkupdates.py
fdroidserver/common.py