Merge branch '1.12'

This commit is contained in:
Jeff Forcier 2014-01-08 16:41:52 -08:00
commit a08ac06083
2 changed files with 2 additions and 2 deletions

View File

@ -57,7 +57,7 @@ if sys.version_info < (2, 5):
__author__ = "Jeff Forcier <jeff@bitprophet.org>"
__version__ = "1.12.0"
__version__ = "1.12.1"
__version_info__ = tuple([ int(d) for d in __version__.split(".") ])
__license__ = "GNU Lesser General Public License (LGPL)"

View File

@ -54,7 +54,7 @@ if sys.platform == 'darwin':
setup(name = "paramiko",
version = "1.12.0",
version = "1.12.1",
description = "SSH2 protocol library",
author = "Jeff Forcier",
author_email = "jeff@bitprophet.org",