]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Sat, 13 Oct 2012 15:58:23 +0000 (11:58 -0400)
committerBenjamin Peterson <benjamin@python.org>
Sat, 13 Oct 2012 15:58:23 +0000 (11:58 -0400)
commit174baa39f61d1512343359970996925652d65092
treeac30ab8a7f85b035d47e4c4c83b53749c0a61e9f
parentd541d3fee4bfee130cbec9ee6f9cf1a96c77ec3e
parentfe4985a1bb5db145e2e7598e0868e190e2436445
merge heads