merge with hg2.4 compat branch stable
authorPierre-Yves David <pierre-yves.david@ens-lyon.org>
Sat, 02 Feb 2013 13:01:34 +0100
branchstable
changeset 666 ae99c0f06fcb
parent 665 bd88067af19d (current diff)
parent 661 f3eb91157cf6 (diff)
child 667 3ce69678a47e
child 668 c5a5e9f2c959
merge with hg2.4 compat branch