summaryrefslogtreecommitdiffhomepage
path: root/sites/www
AgeCommit message (Collapse)Author
2014-03-22Revert "Revert "Changelog fixes #290""Jeff Forcier
This reverts commit bd81c94825747f082c9c066abab8136d9831a3f2.
2014-03-22Merge branch '1.12' into 1.13Jeff Forcier
2014-03-22Merge branch '1.11' into 1.12Jeff Forcier
2014-03-22Revert "Changelog fixes #290"Jeff Forcier
This reverts commit 270dacaf33279bed2ae599d718183cec541e032d.
2014-03-22Merge branch '1.12' into 1.13Jeff Forcier
2014-03-22Merge branch '1.11' into 1.12Jeff Forcier
2014-03-22Changelog fixes #290Jeff Forcier
2014-03-21Merge branch '1.12' into 1.13Jeff Forcier
2014-03-21Merge branch '1.11' into 1.12Jeff Forcier
2014-03-21Merge branch '1.10' into 1.11Jeff Forcier
2014-03-21Uggh how did this slip inJeff Forcier
2014-03-21Merge branch '1.12' into 1.13Jeff Forcier
2014-03-21Merge branch '1.11' into 1.12Jeff Forcier
2014-03-21Changelog re #284Jeff Forcier
2014-03-13Merge branch '1.12' into 1.13Jeff Forcier
Conflicts: paramiko/file.py paramiko/server.py paramiko/sftp_client.py sites/www/changelog.rst
2014-03-13Merge branch '1.11' into 1.12Jeff Forcier
Conflicts: sites/www/changelog.rst
2014-03-13Improve string type testing in Python 2.x versionsJeff Forcier
2014-03-13Changelog for 1.13.0Jeff Forcier
2014-03-13Merge branch '1.12' into 1.13Jeff Forcier
Conflicts: sites/www/changelog.rst
2014-03-13Changelog for 1.12.3Jeff Forcier
2014-03-13Merge branch '1.11' into 1.12Jeff Forcier
Conflicts: sites/www/changelog.rst
2014-03-13Changelog for 1.11.5Jeff Forcier
2014-03-13Merge branch '1.10' into 1.11.Jeff Forcier
Also bump versions like a dummy. Conflicts: paramiko/__init__.py setup.py
2014-03-13Cut 1.10.7Jeff Forcier
2014-03-13Fix accidental Markdown formatting miss for an older entryJeff Forcier
2014-03-13Add changelog re #16Jeff Forcier
2014-03-04Testing out intersphinx in changelogJeff Forcier
2014-03-04Merge branch '1.12'Jeff Forcier
2014-03-04Merge branch '1.11' into 1.12Jeff Forcier
2014-03-04Merge branch '1.10' into 1.11Jeff Forcier
2014-03-04Note Sphinx docs issue was backportedJeff Forcier
2014-03-04Merge branch '1.12'Jeff Forcier
2014-03-04Merge branch '1.11' into 1.12Jeff Forcier
Conflicts: paramiko/hostkeys.py
2014-03-03Merge branch '1.10' into 1.11Jeff Forcier
Conflicts: fabfile.py paramiko/__init__.py
2014-03-03Re-enable Intersphinx from www -> docsJeff Forcier
2014-03-03Changelog re #256Jeff Forcier
2014-02-14Merge branch '1.12'Jeff Forcier
2014-02-14Merge branch '1.11' into 1.12Jeff Forcier
Conflicts: paramiko/hostkeys.py sites/www/changelog.rst
2014-02-14Merge branch '1.10' into 1.11Jeff Forcier
Conflicts: sites/www/changelog.rst
2014-02-14Changelog re hash comparison bugfixJeff Forcier
2014-02-14Merge branch '1.12'Jeff Forcier
Conflicts: sites/www/changelog.rst
2014-02-14Cut 1.12.2Jeff Forcier
2014-02-14Merge branch '1.11' into 1.12Jeff Forcier
Conflicts: paramiko/__init__.py setup.py
2014-02-14Cut 1.11.4Jeff Forcier
2014-02-14Merge branch '1.10' into 1.11Jeff Forcier
Conflicts: paramiko/__init__.py setup.py sites/www/changelog.rst
2014-02-14Cut 1.10.6Jeff Forcier
2014-02-14Merge branch '1.12'Jeff Forcier
2014-02-14Merge branch '1.11' into 1.12Jeff Forcier
2014-02-14Catch & patch trimmingJeff Forcier
2014-02-14Merge branch '1.12'Jeff Forcier
Conflicts: sites/www/changelog.rst