Merge branch '1.14' into 1.15

pkuong · Dec 11, 2015 · c859958 · c859958
2 parents 1c3a65e + 50ad483
commit c859958
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
@@ -2,6 +2,8 @@
 Changelog
 =========
 
+* :support:`636` Clean up and enhance the README (and rename it to
+  ``README.rst`` from just ``README``). Thanks to ``@LucasRMehl``.
 * :bug:`401` Fix line number reporting in log output regarding invalid
   ``known_hosts`` line entries. Thanks to Dylan Thacker-Smith for catch &
   patch.