Merge with 3.3.

This commit is contained in:
Georg Brandl 2013-03-28 13:28:55 +01:00
commit 1bab7134a8
32 changed files with 129 additions and 30 deletions

View file

@ -448,6 +448,8 @@ Callable types
Special attributes:
.. tabularcolumns:: |l|L|l|
+-------------------------+-------------------------------+-----------+
| Attribute | Meaning | |
+=========================+===============================+===========+