| commit | a8ceef4b47ceb0181394e95c4ac1a38824a864f2 | [log] [tgz] |
|---|---|---|
| author | Tim Peters <tim@python.org> | Sun Aug 25 11:53:55 2013 -0500 |
| committer | Tim Peters <tim@python.org> | Sun Aug 25 11:53:55 2013 -0500 |
| tree | 3935b52fe18c1187263dd958ca32cac2f1850edf | |
| parent | b0042000c44bd19d0bdd8e84541cd8dc5c725d95 [diff] | |
| parent | 8f65ef8853c06783b420c01a54dbba0d330836fb [diff] |
Null merge of 2.6 into 2.7. Changeset 50803d881a92 left a new dangling head on 2.6, and the change was applied separately to 2.7 in changeset 1cd24ea5abeb.