master updated (c5d53ac -> ffe8931)

[Jimmy Aguilar Mena]

ergus pushed a change to branch master.

      from  c5d53ac   Fix mailclient-send-it after recent browse-url rewrite
       new  7000396   Enable uniquify-buffer-name-style to be a function.
       new  32220b5   Document use of uniquify-buffer-name-style as a function.
       new  ffe8931   Merge branch 'feature/uniquify-as-function' into master


Summary of changes:
 doc/emacs/buffers.texi | 11 +++++++++++
 etc/NEWS               |  6 ++++++
 lisp/uniquify.el       | 21 ++++++++++++++++-----
 3 files changed, 33 insertions(+), 5 deletions(-)