commit | ab70a7dc41d697ba597aa271f2aea191f6734932 | [log] [tgz] |
---|---|---|
author | Tim Peters <tim@python.org> | Tue Sep 03 11:39:06 2013 -0500 |
committer | Tim Peters <tim@python.org> | Tue Sep 03 11:39:06 2013 -0500 |
tree | f283e57b94a682993a700ea787f5458ac7f6fe9b | |
parent | e6802db7d12a84a1e3bf5def71e7bc4847e811dd [diff] | |
parent | bde2985f1d03d4e11b41a82927acf7cc93ae9faf [diff] |
Null merge of 2.6 into 2.7. Changeset 25683ceaf341 left a new head on 2.6.