]> granicus.if.org Git - python/commit
merge heads
authorAmaury Forgeot d'Arc <amauryfa@gmail.com>
Fri, 13 Apr 2012 00:29:54 +0000 (02:29 +0200)
committerAmaury Forgeot d'Arc <amauryfa@gmail.com>
Fri, 13 Apr 2012 00:29:54 +0000 (02:29 +0200)
commitb413874bc88318d547162359460920c8091c7a6e
tree44ce3d61e3bd5336ca211592425c0eef249f79ef
parent79ec55e980d7b205bbc78d44e0892d0ef37d3abb
parent18d508fc73ae5c126fbaa351d7c1dcd7452608fa
merge heads