chiark / gitweb /
Merge branch 'master' into logging
authorDaniel Martí <mvdan@mvdan.cc>
Tue, 28 Jan 2014 13:14:59 +0000 (14:14 +0100)
committerDaniel Martí <mvdan@mvdan.cc>
Tue, 28 Jan 2014 13:14:59 +0000 (14:14 +0100)
commit2f93ba9bd602db8b687487c90490b7a5f7a1ff8e
tree1f1931a138f57463dfc36ec4b18d6a0304c3dce8
parentdbb6db5bb59a6970755b0237116f21e085bd9355
parentd5859fab3212763b56df372a55930574cf7010df
Merge branch 'master' into logging

Conflicts:
fdroidserver/common.py
fdroid
fdroidserver/build.py
fdroidserver/checkupdates.py
fdroidserver/common.py
fdroidserver/import.py
fdroidserver/init.py
fdroidserver/install.py
fdroidserver/lint.py
fdroidserver/metadata.py
fdroidserver/publish.py
fdroidserver/update.py