| commit | 753009a657e1f53878a351d5cd4be1cbbf483cf7 | [log] [tgz] |
|---|---|---|
| author | Antoine Pitrou <solipsis@pitrou.net> | Mon Apr 11 00:22:08 2011 +0200 |
| committer | Antoine Pitrou <solipsis@pitrou.net> | Mon Apr 11 00:22:08 2011 +0200 |
| tree | 25dae24bec1ed6c3a88eaaa0d56d59b1dfe3692a | |
| parent | eb9e074dcaeaf4212750f32c106fb12fc4d9f57c [diff] | |
| parent | bed9a5b6b38e30b4a207237ac9753cbfa0f2ae99 [diff] |
Merge from 3.2 (issue #11814, issue #8428)