merge default into stable for 2.4 code freeze stable 2.4-rc
authorMatt Mackall <mpm@selenic.com>
Fri, 19 Oct 2012 01:34:50 -0500
branchstable
changeset 17839 d118a4f4fd16
parent 17735 605fe310691f (diff)
parent 17838 d51364b318ea (current diff)
child 17840 af7ccbf2addc
merge default into stable for 2.4 code freeze
mercurial/templates/template-vars.txt
tests/filtercr.py
tests/test-convert-mtn-rename-directory.out