master updated (223c956 -> 96f5871)

[Robert Pluim]

rpluim pushed a change to branch master.

      from  223c956   ; * admin/MAINTAINERS: Add test/infra/*
       new  3dcb629   Don't display redundant 'see' in info-mode
       new  b711847   * doc/misc/flymake.texi: Correct local variable mode 
specification
       new  96f5871   Correct the :inherit property on some faces


Summary of changes:
 doc/misc/flymake.texi | 2 +-
 lisp/ansi-color.el    | 6 +++---
 lisp/faces.el         | 4 ++--
 lisp/info.el          | 9 ++++++++-
 4 files changed, 14 insertions(+), 7 deletions(-)