chiark - git - ianmdlvl - fdroidserver.git/commit

chiark / gitweb /

~ianmdlvl / fdroidserver.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d525d98 66a431a)

author	Daniel Martí <mvdan@mvdan.cc>
	Fri, 1 Nov 2013 12:57:10 +0000 (13:57 +0100)
committer	Daniel Martí <mvdan@mvdan.cc>
	Fri, 1 Nov 2013 12:57:10 +0000 (13:57 +0100)
commit	ff3faefd8084f57e98bce0154fc264a96a48d38c
tree	063f7e8b7af22a3410195e77d26c036fcbb299d3	tree \| snapshot
parent	d525d987e20c7ebccfe309f3815fa38d8282d9f5	commit \| diff
parent	66a431a14aaeb31070a92df31b92c72ef0c2a84e	commit \| diff

Merge branch 'verbose-rewrite' of gitorious.org:f-droid/fdroidserver into verbose-rewrite

Conflicts:
fdroidserver/common.py

fdroidserver/common.py

Unnamed repository; edit this file 'description' to name the repository.