tree c5bbe9850c5f78952cf0cd14143d1f08c43999bd
parent 6636887104bb3ebe180682a8ce10fee8fbc0c46e
parent 261896b5591e819fe9c874e69469783c16161586
author Mark Dickinson <mdickinson@enthought.com> 1327699024 +0000
committer Mark Dickinson <mdickinson@enthought.com> 1327699024 +0000
HG:rename-source hg

Merge 3.2 -> default (issue 13889)