release: merge back stable branch into default

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

@@ -0,0 +1,43 b''
+|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
+^^^^^^^^^^^^^
+
+

.hgtags

@@ -16,3 +16,4 b' 416fec799314c70a5c780fb28b3357b08869333a'
 27c3b85fafc83143e6678fbc3da69e1615bcac55 v4.6.0
 5ad13deb9118c2a5243d4032d4d9cc174e5872db v4.6.1
 2be921e01fa24bb102696ada596f87464c3666f6 v4.7.0
+7198bdec29c2872c974431d55200d0398354cdb1 v4.7.1

docs/release-notes/release-notes.rst

@@ -9,6 +9,7 b' 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