tree 272dc1b14821e930e23366e14a328313f5d47009
parent d8c73c650ce5554f3757f17cf0f979a897decf80
parent 451385d8f8e8bedd347d363fd0e01288226daee2
author Victor Stinner <victor.stinner@haypocalc.com> 1300674490 +0100
committer Victor Stinner <victor.stinner@haypocalc.com> 1300674490 +0100

merge 3.1 (already commited before)