Merge with stable
authorMatt Mackall <mpm@selenic.com>
Mon, 05 Apr 2010 17:48:48 -0500
changeset 10862 f97b98db6fd1
parent 10861 30cce7010630 (current diff)
parent 10860 36cec3184612 (diff)
child 10867 aeae527c6ac7
Merge with stable