diff Makefile @ 15717:9cf1620e1e75

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 22 Dec 2011 15:56:27 -0600
parents 3ca419fb435e
children 0c4bec9596d8
line wrap: on
line diff