commit | dd2e94d80c4f291a7d382db5756efd8ec26aa9e7 | [log] [tgz] |
---|---|---|
author | Victor Stinner <victor.stinner@haypocalc.com> | Wed May 11 00:58:26 2011 +0200 |
committer | Victor Stinner <victor.stinner@haypocalc.com> | Wed May 11 00:58:26 2011 +0200 |
tree | bb239f54caca4a082e47a83cb73e408a9eb3e6ca | |
parent | 530712625bac0cb8b507746406163b66f2d36c49 [diff] | |
parent | ba9c6645f795c7bf82ee097a240cbd060605afe7 [diff] |
Merge 3.1 (empty merge, a similar patch was already applied)