merge heads

This commit is contained in:
Georg Brandl 2013-03-16 08:03:13 +01:00
commit e3eb0615af

View file

@ -28,7 +28,7 @@ the following manner:
| | | ``0xB`` for beta, ``0xC`` for release |
| | | candidate and ``0xF`` for final), in this |
| | | case it is alpha. |
| +-------------------------+------------------------------------------------+
+-------+-------------------------+------------------------------------------------+
| | ``29-32`` | ``PY_RELEASE_SERIAL`` (the ``2`` in |
| | | ``3.4.1a2``, zero for final releases) |
+-------+-------------------------+------------------------------------------------+