diff setup.py @ 26112:cb6cfbf21735

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 31 Aug 2015 17:21:38 -0500
parents 95e042d77a5f
children 4b0fc75f9403
line wrap: on
line diff