comparison hg @ 26014:a5f62af29517

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 12 Aug 2015 17:01:50 -0500
parents 73e4a02e6d23
children 2ea9c9aa6e60
comparison
equal deleted inserted replaced
26013:38f92d12357c 26014:a5f62af29517