merge with stable
authorMatt Mackall <mpm@selenic.com>
Mon, 19 Dec 2011 14:04:33 -0600
changeset 15693 54f2205d8ea9
parent 15692 65d1c54ca705 (current diff)
parent 15691 7722593fef5c (diff)
child 15694 1e4e49c58b94
merge with stable