Merge remote-tracking branch 'savannah/master' into dev

diff --cc .gitignore
Simple merge

diff --cc configure.ac
Simple merge

diff --cc lisp/emacs-lisp/advice.el
Simple merge

diff --cc lisp/help.el
Simple merge

diff --cc lisp/international/mule.el
Simple merge

diff --cc lisp/loadup.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/doc.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/pdumper.c
Simple merge

diff --cc test/lisp/help-fns-tests.el
Simple merge