release: merge back stable branch into default

docs/release-notes/release-notes-4.7.1.rst

@@ -0,0 +1,43 @@
+|RCE| 4.7.1 |RNS|
+-----------------
+
+Release Date
+^^^^^^^^^^^^
+
+- 2017-04-13
+
+
+New Features
+^^^^^^^^^^^^
+
+
+
+General
+^^^^^^^
+
+
+Security
+^^^^^^^^
+
+- Auth plugins: don't expose sensitive information inside DEBUG log for auth
+  plugins (such as ldap access passwords).
+  Each plugin now defines a black-list of arguments to hide from logging.
+
+
+Performance
+^^^^^^^^^^^
+
+
+
+Fixes
+^^^^^
+
+- Largefiles: fix errors on fetching largefiles from web interface when viewing
+  from specific branch.
+- User Admin: fix problem with sorting for Mysql database.
+
+
+Upgrade notes
+^^^^^^^^^^^^^
+
+

docs/release-notes/release-notes.rst

@@ -9,6 +9,7 @@ Release Notes
 .. toctree::
    :maxdepth: 1
 
+   release-notes-4.7.1.rst
    release-notes-4.7.0.rst
    release-notes-4.6.1.rst
    release-notes-4.6.0.rst