diff setup.py @ 23644:17b2ab77f453

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 22 Dec 2014 17:26:21 -0600
parents d66547df8207
children 9641643fac71
line wrap: on
line diff