chiark / gitweb /
Merge branch 'master' into logging
authorDaniel Martí <mvdan@mvdan.cc>
Sun, 2 Feb 2014 18:45:17 +0000 (19:45 +0100)
committerDaniel Martí <mvdan@mvdan.cc>
Sun, 2 Feb 2014 18:45:17 +0000 (19:45 +0100)
1  2 
fdroid
fdroidserver/install.py
fdroidserver/metadata.py

diff --cc fdroid
Simple merge
Simple merge
Simple merge