diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-08-25 23:43:01 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-08-25 23:43:01 -0700 |
| commit | deea38fa49914d9a0e19cc3994b4d2aa0dfa3e58 (patch) | |
| tree | d5c9a0eecea4346eb98756e7a595f746f27f5a81 /sites/www | |
| parent | 401b2fcb6514c723877cece9c13aa27281c7d994 (diff) | |
| parent | 1b69e0f4095883ef3f282552fde12dfb00ebdda4 (diff) | |
Merge branch '1.13' into 1.14
Conflicts:
paramiko/__init__.py
setup.py
Diffstat (limited to 'sites/www')
| -rw-r--r-- | sites/www/changelog.rst | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 33b6d220..c4c1e698 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,7 @@ Changelog ========= +* :release:`1.13.2 <2014-08-25>` * :bug:`376` Be less aggressive about expanding variables in ``ssh_config`` files, which results in a speedup of SSH config parsing. Credit to Olle Lundberg. |