master updated (428950fc3c -> 3312710fd6)

[Lars Ingebrigtsen]

larsi pushed a change to branch master.

      from  428950fc3c Improve Tramp's manual
       new  84082a0e84 Tweak admin/emacs output
       new  3312710fd6 Make conf-javaprop-mode only claim that # lines are 
comments


Summary of changes:
 admin/emake                            |  2 +-
 lisp/textmodes/conf-mode.el            | 13 +++----------
 test/lisp/textmodes/conf-mode-tests.el |  5 +----
 3 files changed, 5 insertions(+), 15 deletions(-)