dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch '1.10' into 1.11 

Conflicts:
	sites/www/changelog.rst
This commit is contained in:
Jeff Forcier 2014-01-30 14:32:10 -08:00
parent 397cd4ce99 4aa9668653
commit 0a90bef4f4
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sites/www/changelog.rst
View File

@ -2,8 +2,6 @@
Changelog Changelog
========= =========
* :release:`1.11.4 <2014-01-21>` 193
* :release:`1.10.6 <2014-01-21>` 193
* :bug:`193` (and its attentant PRs :issue:`230` & :issue:`253`): Fix SSH agent * :bug:`193` (and its attentant PRs :issue:`230` & :issue:`253`): Fix SSH agent
problems present on Windows. Thanks to David Hobbs for initial report and to problems present on Windows. Thanks to David Hobbs for initial report and to
Aarni Koskela & Olle Lundberg for the patches. Aarni Koskela & Olle Lundberg for the patches.