master updated (1d9d07fb00e -> 445f376e4e6)

[Stefan Monnier]

monnier pushed a change to branch master.

      from  1d9d07fb00e (cl--typeof-types): Rework to fix some regressions
       new  1a37fe3a669 Revert "Set org-macro-templates more lazily"
       new  445f376e4e6 Revert "ox-texinfo:: Require only TEXINFO_DIR_CATEGORY"


Summary of changes:
 doc/misc/org.org       | 11 ++--------
 lisp/org/org-macro.el  |  8 +++----
 lisp/org/org-macs.el   |  4 +---
 lisp/org/org.el        | 21 +++++++++---------
 lisp/org/ox-texinfo.el | 58 ++++++++++++++++++++++++++------------------------
 5 files changed, 47 insertions(+), 55 deletions(-)