]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Sat, 15 Dec 2012 20:46:20 +0000 (15:46 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sat, 15 Dec 2012 20:46:20 +0000 (15:46 -0500)
commit3a31ecd8276397fed6703581a07a47ed15b28299
tree68194410d40269288057190b2baef8ca9b24cfdd
parent6a020e8065f13737ff5f1380c132be097b4b02f9
parent74d6c250e1ce0e5efc03575eaaa1b8cab66241eb
merge heads