master updated (fb386e22e1 -> 0e1a06ac85)

[Lars Ingebrigtsen]

larsi pushed a change to branch master.

      from  fb386e22e1 Fix a hang on servers that don't support the X Keyboard 
Extension
       new  918ed4904b Adjust multi-test-files-simple test for Windows
       new  bdd0b071be Ignore manual/ directory made by admin/make-manuals
       new  0e1a06ac85 Make multi-test-files-busy shorter


Summary of changes:
 .gitignore                                 |  3 +++
 test/lisp/emacs-lisp/multisession-tests.el | 11 +++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)