chiark / gitweb /
Merge branch 'master' into logging
authorDaniel Martí <mvdan@mvdan.cc>
Thu, 30 Jan 2014 22:58:23 +0000 (23:58 +0100)
committerDaniel Martí <mvdan@mvdan.cc>
Thu, 30 Jan 2014 22:58:23 +0000 (23:58 +0100)
commit430cd42f80b97affc876f6752dfed915cf316b76
treebe113c3485dd157ab8a0329207338a53771c1cc7
parent72fa1891bf19acc88a5135aea6d1b068282b5e50
parentc31d3f058199b26ecf1ae772377771f1098ce4b5
Merge branch 'master' into logging

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