merge heads

This commit is contained in:
Benjamin Peterson 2012-03-15 13:57:38 -05:00
commit c7536c4ff5
12 changed files with 142 additions and 69 deletions

View file

@ -2,7 +2,7 @@
/* Python version identification scheme.
When the major or minor version changes, the VERSION variable in
configure.in must also be changed.
configure.ac must also be changed.
There is also (independent) API version information in modsupport.h.
*/