[Python-checkins] cpython (merge 3.3 -> default): merge with 3.3

Sat Mar 16 08:03:54 CET 2013

http://hg.python.org/cpython/rev/baad8b9888cc
changeset: 82686:baad8b9888cc
parent: 82683:7c76b70075db
parent: 82685:c2be613f5ea6
user: Georg Brandl <georg at python.org>
date: Sat Mar 16 08:03:51 2013 +0100
summary:
 merge with 3.3
files:
 Doc/c-api/apiabiversion.rst | 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Doc/c-api/apiabiversion.rst b/Doc/c-api/apiabiversion.rst
--- a/Doc/c-api/apiabiversion.rst
+++ b/Doc/c-api/apiabiversion.rst
@@ -28,7 +28,7 @@
 | | | ``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) |
 +-------+-------------------------+------------------------------------------------+
-- 
Repository URL: http://hg.python.org/cpython
