]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 24 Jan 2012 14:06:45 +0000 (09:06 -0500)
committerBenjamin Peterson <benjamin@python.org>
Tue, 24 Jan 2012 14:06:45 +0000 (09:06 -0500)
commit8485ad1410f790abbd3bb2c019b4657241586f57
tree04c8fdbe938b0c746711353ef0960480ce36f2b6
parent3ef2f8c296ec144586fe35babbaf9d644c7ad222
parent91ecea24f53b99aa190f6b17c2b51d95cb09d233
merge heads