------------------------------------------------------------
revno: 108798 [merge]
committer: Glenn Morris <rgm@gnu....>
branch nick: trunk
timestamp: Thu 2012-06-28 23:28:37 -0700
message:
  Merge from emacs-24; up to r108062
modified:
  doc/emacs/ChangeLog
  doc/emacs/fixit.texi
  etc/PROBLEMS
  lisp/ChangeLog
  lisp/calendar/cal-dst.el
  lisp/minibuffer.el
  lisp/progmodes/cperl-mode.el
  lisp/progmodes/f90.el
  lisp/progmodes/which-func.el
  lisp/textmodes/enriched.el
  src/ChangeLog
  src/charset.c
  src/gnutls.c