merge heads
authorBenjamin Peterson <benjamin@python.org>
Wed, 11 Jan 2012 23:17:40 +0000 (18:17 -0500)
committerBenjamin Peterson <benjamin@python.org>
Wed, 11 Jan 2012 23:17:40 +0000 (18:17 -0500)
commit22ef4fa7e9805312c83b595b27218443c367dcd0
treebc03d5f7dcfc79f277987cfc55d24c8f690638ac
parentb2bf01d824ea5a13b375d0aa79211c01f8ab726a
parent982c91e4c9bbf8b8b62cda779d31beac2350fa58
merge heads
Doc/library/stdtypes.rst