]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1ce5d18 5ac56d2)
merge 2.6
authorBenjamin Peterson <benjamin@python.org>
Wed, 29 Jun 2011 02:58:27 +0000 (21:58 -0500)
committerBenjamin Peterson <benjamin@python.org>
Wed, 29 Jun 2011 02:58:27 +0000 (21:58 -0500)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.