merge default into stable for 3.2 freeze stable
authorMatt Mackall <mpm@selenic.com>
Sat, 18 Oct 2014 18:04:31 -0500
branchstable
changeset 23048 ee5f834077be
parent 22843 b6531d806de8 (diff)
parent 23047 f10019d2ee0a (current diff)
child 23050 7f8d16af8cae
merge default into stable for 3.2 freeze
contrib/convert-repo
contrib/docker/fedora
contrib/sample.hgrc
mercurial/dicthelpers.py
tests/test-bundle2.t
tests/test-commandserver.py
tests/test-commandserver.py.out
tests/test-dicthelpers.py