commit | e9c84b658a40ca38923752c615a88744da3cfe24 | [log] [tgz] |
---|---|---|
author | Victor Stinner <victor.stinner@haypocalc.com> | Wed May 11 00:59:08 2011 +0200 |
committer | Victor Stinner <victor.stinner@haypocalc.com> | Wed May 11 00:59:08 2011 +0200 |
tree | 3d19ff680d0e9b9209a5e1f6b30a35168cafe050 | |
parent | 7742103a9386f271fb6c196ace425596b3bfd111 [diff] | |
parent | dd2e94d80c4f291a7d382db5756efd8ec26aa9e7 [diff] |
Merge 3.2 (empty merge, patch already applied to 3.3)