Merge changes made in Emacs trunk
authorGlenn Morris <rgm@gnu.org>
Tue, 13 Aug 2013 07:27:48 +0000 (07:27 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 13 Aug 2013 07:27:48 +0000 (07:27 +0000)
commitbaf05b14d1562dbcef68a2e409e7053a58c11273
treece3917a1618636472915bb6dc83807546405abbb
parent05114551378e6988aa8c4bc322a9f1d4fb27ca34
Merge changes made in Emacs trunk

epa.texi (Encrypting/decrypting gpg files):
  Rename nodes to avoid characters that can cause Texinfo problems.
gnus-icalendar.el (gnus-icalendar-org-capture-file): Fix type.
gnus.el (gnus-valid-select-methods): Fix type.
nnimap.el (nnimap-request-articles-find-limit): Fix type, version.
lisp/ChangeLog
lisp/gnus-icalendar.el
lisp/gnus.el
lisp/nnimap.el
texi/ChangeLog
texi/epa.texi