diff setup.py @ 16864:92cfde8728ac

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 04 Jun 2012 16:59:57 -0500
parents e6af8676302f
children f20e4d76b711
line wrap: on
line diff