Merge branch '1.11' into 1.12

Conflicts:
	paramiko/__init__.py
	setup.py
This commit is contained in:
Jeff Forcier 2014-05-07 13:40:19 -07:00
commit ec2460fb3c
1 changed files with 1 additions and 0 deletions

View File

@ -2,6 +2,7 @@
Changelog
=========
* :release:`1.11.6 <2014-05-07>`
* :bug:`-` Added self.args for exception classes. Used for unpickling. Related
to (`Fabric #986 <https://github.com/fabric/fabric/issues/986>`_, `Fabric
#714 <https://github.com/fabric/fabric/issues/714>`_). Thanks to Alex