]> granicus.if.org Git - python/commit
Null merge of 2.6 into 2.7.
authorTim Peters <tim@python.org>
Sun, 25 Aug 2013 16:53:55 +0000 (11:53 -0500)
committerTim Peters <tim@python.org>
Sun, 25 Aug 2013 16:53:55 +0000 (11:53 -0500)
commita8ceef4b47ceb0181394e95c4ac1a38824a864f2
tree3935b52fe18c1187263dd958ca32cac2f1850edf
parentb0042000c44bd19d0bdd8e84541cd8dc5c725d95
parent8f65ef8853c06783b420c01a54dbba0d330836fb
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.