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

@ -278,6 +278,8 @@ module. We'll be using the ``countrydata`` XML document from the
Supported XPath syntax
^^^^^^^^^^^^^^^^^^^^^^
.. tabularcolumns:: |l|L|
+-----------------------+------------------------------------------------------+
| Syntax | Meaning |
+=======================+======================================================+