master updated (33611906e8 -> 4c1bc8315d)

[Lars Ingebrigtsen]

larsi pushed a change to branch master.

      from  33611906e8 Rename make-doctor-variables to doctor-make-variables
       new  f025005e86 Fix double-encoding attachment headers in single-part 
rfc2047
       new  4c1bc8315d Fix up some prefix registration problems in doc strings


Summary of changes:
 lisp/battery.el            | 16 ++++++++--------
 lisp/emacs-lisp/cl-macs.el |  6 +++---
 lisp/mail/rfc2047.el       |  3 +++
 lisp/org/ob-core.el        | 12 ++++++------
 lisp/uniquify.el           |  4 ++--
 5 files changed, 22 insertions(+), 19 deletions(-)