projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3ed559a b528fcf)
merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 25 Oct 2011 04:06:15 +0000 (00:06 -0400)
committerBenjamin Peterson <benjamin@python.org>
Tue, 25 Oct 2011 04:06:15 +0000 (00:06 -0400)

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