]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Thu, 26 May 2011 14:57:21 +0000 (09:57 -0500)
committerBenjamin Peterson <benjamin@python.org>
Thu, 26 May 2011 14:57:21 +0000 (09:57 -0500)
commit1e94021ea59bfdefc03c6af405fd18d64a789d71
tree291435c3cdc4b999a9ca5c4b75f881f9f6ec11a1
parent4fa68ab10bc6bcd6d0fcc422bb0807f6f9d56264
parent8fcda6829a457616d323d1282a3c434af20224c5
merge heads