merge with stable
authorMatt Mackall <mpm@selenic.com>
Fri, 01 May 2015 17:21:10 -0500
changeset 24895 7e67ddd08a2e
parent 24802 2ee10789d66b (diff)
parent 24894 c48850339988 (current diff)
child 24896 9183cb6886ef
merge with stable