merge 3.3

This commit is contained in:
Benjamin Peterson 2013-10-10 20:22:39 -04:00
commit a76795bf53

View file

@ -1322,7 +1322,7 @@ PyDoc_STRVAR(unicodedata_docstring,
"This module provides access to the Unicode Character Database which\n\
defines character properties for all Unicode characters. The data in\n\
this database is based on the UnicodeData.txt file version\n\
6.3.0 which is publically available from ftp://ftp.unicode.org/.\n\
" UNIDATA_VERSION " which is publically available from ftp://ftp.unicode.org/.\n\
\n\
The module uses the same names and symbols as defined by the\n\
UnicodeData File Format " UNIDATA_VERSION ".");