]> granicus.if.org Git - python/commitdiff
Null merge with 2.6
authorAndrew Kuchling <amk@amk.ca>
Sun, 15 Sep 2013 17:24:05 +0000 (13:24 -0400)
committerAndrew Kuchling <amk@amk.ca>
Sun, 15 Sep 2013 17:24:05 +0000 (13:24 -0400)

Trivial merge