merge default into stable for 2.0 code freeze stable 2.0-rc
authorMatt Mackall <mpm@selenic.com>
Sat, 15 Oct 2011 14:30:50 -0500
branchstable
changeset 15273 384082750f2c
parent 15191 fccd350acf79 (diff)
parent 15272 2889d4574726 (current diff)
child 15274 a06575962c9e
merge default into stable for 2.0 code freeze