tree 3a215086f26acf1e54ea774d003bc02937cd3e78
parent c09fca67e7babfda22964143c74dcd313470850a
parent bbcfc1f2d926c1198b4c23a6e5640e3f3aee9d98
author Éric Araujo <merwok@netwok.org> 1300851651 +0100
committer Éric Araujo <merwok@netwok.org> 1300851651 +0100
HG:rename-source hg

Merge from 3.2.

The fix was already present in 3.3, but I merged two small changes
recommended by Raymond while I was working on the 2.7 patch to ease
future merges.