tree fd1edd14eba77817c29d5a8ac778d6524e9ed497
parent e9ddbf65a87d37c81cad5ea1369ea8b2202e7701
parent 8e5e942c594aa29351cdc8ce5802159700cd2dc6
author Antoine Pitrou <solipsis@pitrou.net> 1300815213 +0100
committer Antoine Pitrou <solipsis@pitrou.net> 1300815213 +0100
HG:rename-source hg

Merge