merge with stable
authorMatt Mackall <mpm@selenic.com>
Thu, 16 Sep 2010 16:12:26 -0500
changeset 12315 ca58f6475f1d
parent 12314 f2daa6ab514a (current diff)
parent 12309 fe20536c09d4 (diff)
child 12316 4134686b83e1
merge with stable