merge heads

This commit is contained in:
Benjamin Peterson 2012-03-12 09:28:26 -07:00
commit 800b3aa57f
1 changed files with 1 additions and 1 deletions

View File

@ -147,7 +147,7 @@ Glossary
dictionary
An associative array, where arbitrary keys are mapped to values. The keys
can be any object with :meth:`__hash__` function and :meth:`__eq__`
can be any object with :meth:`__hash__` method and :meth:`__eq__`
methods. Called a hash in Perl.
docstring