merge default into stable for 3.4 freeze stable 3.4-rc
authorMatt Mackall <mpm@selenic.com>
Thu, 16 Apr 2015 20:57:51 -0500
branchstable
changeset 24803 e89f909edffa
parent 24753 612ed41ae359 (diff)
parent 24802 2ee10789d66b (current diff)
child 24804 2fe9fd88db0b
merge default into stable for 3.4 freeze
contrib/lock-checker.py