[Emacs-diffs] master updated (f577f59 -> 6bdd366)

[Lars Ingebrigtsen]

larsi pushed a change to branch master.

      from  f577f59   Fix merge conflicts in network-stream-tests.el
       new  f500749   Clean up debugging code
       new  6bdd366   Clean up forgotten text in manual


Summary of changes:
 doc/lispref/display.texi |    5 -----
 src/process.c            |    7 +++----
 2 files changed, 3 insertions(+), 9 deletions(-)