[Emacs-diffs] master updated (56274bc -> 16813e6)

[Teodor Zlatanov]

tzz pushed a change to branch master.

      from  56274bc   Add a Makefile rule for running gitmerge
       new  1d0a37f   auth-source: support JSON backend with .json extension
       new  16813e6   * doc/misc/auth.texi (Help for users): Mention JSON 
backend.


Summary of changes:
 doc/misc/auth.texi  |  13 +++++-
 lisp/auth-source.el | 113 +++++++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 111 insertions(+), 15 deletions(-)