]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Sat, 29 Sep 2012 17:47:47 +0000 (13:47 -0400)
committerBenjamin Peterson <benjamin@python.org>
Sat, 29 Sep 2012 17:47:47 +0000 (13:47 -0400)
commit9201214c2ce00ec5d516ce3023838a65c9fccdb5
treeb4ba2cfa70f9bac5d6bff396e050f4953038d67e
parentb8350f1c7dcf3c96b165dc48c88b36fac0fdf627
parentf3aef05e6b948fc13f4dbf071822ea3bcb46dee6
merge heads