Merge branch '1.12' into 1.13

This commit is contained in:
Jeff Forcier 2014-03-21 11:21:26 -07:00
commit afff987925
1 changed files with 1 additions and 0 deletions

View File

@ -73,6 +73,7 @@ setup(
'Topic :: Security :: Cryptography', 'Topic :: Security :: Cryptography',
'Programming Language :: Python', 'Programming Language :: Python',
'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.5',
'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3',