Merge branch '1.14' into 1.15

Conflicts: sites/www/changelog.rst
rsheshadri · Dec 18, 2014 · 6a3630d · 6a3630d
2 parents b09d6c0 + b3732cd
commit 6a3630d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
@@ -38,7 +38,7 @@ Changelog
   packets encountered type errors. This is now fixed. Thanks to ``@mjmaenpaa``
   for the catch.
 * :bug:`320` Update our win_pageant module to be Python 3 compatible. Thanks to
-``@sherbang`` and ``@adamkerz`` for the patches.
+  ``@sherbang`` and ``@adamkerz`` for the patches.
 * :release:`1.15.1 <2014-09-22>`
 * :bug:`399` SSH agent forwarding (potentially other functionality as
   well) would hang due to incorrect values passed into the new window size