]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Fri, 12 Oct 2012 16:05:01 +0000 (12:05 -0400)
committerBenjamin Peterson <benjamin@python.org>
Fri, 12 Oct 2012 16:05:01 +0000 (12:05 -0400)
commitb548d49f655311835b72e0a27e51d5b73e671c82
treed1fb51b1a02859d322e668b1770fcf268c7cbdbf
parent143d034ecd110f8543eba4ad76dfb6085cdaeb3d
parent1dd7c304194572c3c5e6fd943bc0aac49a4c481c
merge heads