diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-08-26 12:50:30 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-08-26 12:50:30 -0700 |
| commit | 8dfc2b79cbf86e8e5fce4b7a6cedf9c4b5be706d (patch) | |
| tree | 9b71f5c776e893ca2566bc555a5b30903545aef3 /sites/www | |
| parent | 12cc48839c607fe51e4b3c672bb91594725d2747 (diff) | |
| parent | b641c69a80e2bd4737c636e7edd0918d6753c3d0 (diff) | |
Merge branch '1.13' into 1.14
Conflicts:
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 0bed707b..426a9ee3 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,8 @@ Changelog ========= +* :support:`378 backported` Minor code cleanup in the SSH config module + courtesy of Olle Lundberg. * :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`` |