diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-08-26 12:53:15 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-08-26 12:53:15 -0700 |
| commit | 769fbac0353d1efb4213c78f5ec22a1247e4da9d (patch) | |
| tree | 4e6781297384caa2608f2493f36b80c44ef70a48 /sites/www | |
| parent | 8dfc2b79cbf86e8e5fce4b7a6cedf9c4b5be706d (diff) | |
| parent | 162eebf704b5111d34f430488868d3185d51ba21 (diff) | |
Merge branch '1.13' into 1.14
Conflicts:
paramiko/__init__.py
setup.py
sites/www/changelog.rst
Diffstat (limited to 'sites/www')
| -rw-r--r-- | sites/www/changelog.rst | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 426a9ee3..b8110393 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -4,6 +4,8 @@ Changelog * :support:`378 backported` Minor code cleanup in the SSH config module courtesy of Olle Lundberg. +* :support:`249` Consolidate version information into one spot. Thanks to Gabi + Davar for the reminder. * :release:`1.14.1 <2014-08-25>` * :release:`1.13.2 <2014-08-25>` * :bug:`376` Be less aggressive about expanding variables in ``ssh_config`` |