merge default into stable for 2.5 code freeze stable 2.5-rc
authorMatt Mackall <mpm@selenic.com>
Sat, 19 Jan 2013 17:24:33 -0600
branchstable
changeset 18453 f5fbe15ca744
parent 18323 7648b87e76db (diff)
parent 18452 8bd338c7c4c9 (current diff)
child 18454 a9475e8936bc
merge default into stable for 2.5 code freeze
tests/test-inotify-issue1208.t
tests/test-mq-caches.t