chiark / gitweb /
Merge branch 'master' into logging
authorDaniel Martí <mvdan@mvdan.cc>
Wed, 29 Jan 2014 12:57:57 +0000 (13:57 +0100)
committerDaniel Martí <mvdan@mvdan.cc>
Wed, 29 Jan 2014 12:57:57 +0000 (13:57 +0100)
commit72fa1891bf19acc88a5135aea6d1b068282b5e50
tree48ff9f0733033518e5aeae8815f8aeea6ef684ef
parent2f93ba9bd602db8b687487c90490b7a5f7a1ff8e
parent63a0e859ff81cb03182af68e6c6bfff4d83386d8
Merge branch 'master' into logging

Conflicts:
fdroidserver/build.py
fdroidserver/build.py
fdroidserver/common.py
fdroidserver/metadata.py