summaryrefslogtreecommitdiffhomepage
path: root/sites/www
AgeCommit message (Collapse)Author
2014-12-17Merge branch '1.14' into 1.15Jeff Forcier
Conflicts: sites/www/changelog.rst
2014-12-17Merge branch '1.13' into 1.14Jeff Forcier
2014-12-17Changelog closes #422Jeff Forcier
2014-12-17Changelog re #421, closes #421Jeff Forcier
2014-12-17Changelog re #419, closes #419Jeff Forcier
2014-12-17Merge branch '1.15'Jeff Forcier
2014-12-17Merge branch '1.14' into 1.15Jeff Forcier
Conflicts: paramiko/transport.py
2014-12-17Merge branch '1.13' into 1.14Jeff Forcier
2014-12-17Changelog re #266Jeff Forcier
2014-12-17Merge branch '1.15'Jeff Forcier
2014-12-17Merge branch '1.14' into 1.15Jeff Forcier
2014-12-17Merge branch '1.13' into 1.14Jeff Forcier
2014-12-17Changelog re #459Jeff Forcier
2014-11-12Merge branch '1.15'Jeff Forcier
2014-11-12Merge branch '1.14' into 1.15Jeff Forcier
Conflicts: tests/test_util.py
2014-11-12Merge branch '1.13' into 1.14Jeff Forcier
2014-11-12Changelog re #429Jeff Forcier
2014-10-01Merge branch '1.15'Jeff Forcier
2014-10-01Merge branch '1.14' into 1.15Jeff Forcier
Conflicts: sites/www/changelog.rst
2014-10-01Merge branch '1.13' into 1.14Jeff Forcier
2014-10-01Changelog re #320Jeff Forcier
Closes #409
2014-09-22Merge branch '1.15'Jeff Forcier
Conflicts: sites/www/changelog.rst
2014-09-22Cut 1.15.1Jeff Forcier
2014-09-22Changelog re #399Jeff Forcier
2014-09-19Changelog re #167Jeff Forcier
2014-09-18Cut 1.15Jeff Forcier
2014-09-18Changelog re #393Jeff Forcier
2014-09-18Note how python-gssapi only works on 2.7+Jeff Forcier
2014-09-18Install docs tweak re: GSSAPI reqJeff Forcier
2014-09-08Tweak changelog again for more tickets, use actually-merged PR as main issue ↵Jeff Forcier
number
2014-09-08Update README, docs, changelog re #267Jeff Forcier
2014-09-08Update changelog re #267, #250Jeff Forcier
2014-09-08Merge branch 'master' into 267-intJeff Forcier
Conflicts: paramiko/client.py paramiko/transport.py sites/www/changelog.rst
2014-09-08Changelog re #346Jeff Forcier
2014-09-08Changelog re #362Jeff Forcier
2014-09-08Changelog re #372Jeff Forcier
2014-09-08Changelog re #373Jeff Forcier
2014-09-08Changelog re #374, #375Jeff Forcier
2014-09-08Changelog re #377Jeff Forcier
2014-09-08Changelog re #298Jeff Forcier
2014-09-06Changelog re #234Jeff Forcier
2014-09-05Changelog re #218Jeff Forcier
2014-09-05Changelog re #335Jeff Forcier
2014-09-05Changelog re #184Jeff Forcier
2014-09-05Changelog re #131Jeff Forcier
2014-08-26Merge branch '1.13' into 1.14Jeff Forcier
Conflicts: paramiko/__init__.py setup.py sites/www/changelog.rst
2014-08-26Consolidate version info. Closes #249Jeff Forcier
Conflicts: paramiko/__init__.py setup.py sites/www/changelog.rst
2014-08-26Merge branch '1.14'Jeff Forcier
Conflicts: sites/www/changelog.rst
2014-08-26Merge branch '1.13' into 1.14Jeff Forcier
Conflicts: sites/www/changelog.rst
2014-08-26Backport #378 to 1.13, closes #378Jeff Forcier