Merge from origin/emacs-24
0077b36 # NEWS copyedits
3ca2ff3 * lisp/erc/erc.el (erc-rename-buffers): Doc fix. Add :version.
b85523f * lisp/textmodes/flyspell.el (flyspell-duplicate-distance):
decb48d Augment text-mode syntax table for a few special characters
8b3ba7a Improve docs of transient-mark-mode (Bug#19841)
72fd047 NEWS: Add section to include ERC changes
a7254bb Improve string search in `flyspell-word-search-*`. (Bug#16800)
Conflicts:
etc/ChangeLog
etc/NEWS
lisp/ChangeLog
lisp/erc/ChangeLog
src/ChangeLog