tree fd1edd14eba77817c29d5a8ac778d6524e9ed497
parent 36920354c7f59f737c286a291aef19bdabc66dfc
parent 7500f92fce42ed4f6cb44d8281178f53301df239
author Antoine Pitrou <solipsis@pitrou.net> 1300815261 +0100
committer Antoine Pitrou <solipsis@pitrou.net> 1300815261 +0100
HG:rename-source hg

Merge