chiark / gitweb /
Merge branch 'master' of git://gitorious.org/f-droid/fdroidserver
authorDavid Black <david8black@gmail.com>
Mon, 11 Feb 2013 16:05:24 +0000 (16:05 +0000)
committerDavid Black <david8black@gmail.com>
Mon, 11 Feb 2013 16:05:24 +0000 (16:05 +0000)
commit25c6c4abd406648269f9dff3b5a05ef3658c08aa
tree8bd04702555d952f43d85a85b18530c5eb9670c6
parent9a6d9e478cc237d17c8f52b6c360a7251af189b4
parent80808133d47a6a957d99361b5e534624f610b25b
Merge branch 'master' of git://gitorious.org/f-droid/fdroidserver

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