Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

Conflicts:
	lisp/ChangeLog

diff --cc lisp/ChangeLog
index f6a79c7dea63cb0b572767eef0cd875dad7c7793,fb82b5b574a9dbc3ccc9f467b9c51c6a1a18d1db..33e14568376058e4708ea39e6571cdd261262378
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,16 -1,8 +1,21 @@@
 +2015-04-05  Richard Stallman  <rms@gnu.org>
 +
 +      * mail/rmail.el (rmail-show-message-1): When displaying a mime message,
 +      indicate start and finish in the echo area.
 +
 +      * mail/rmail.el (rmail-epa-decrypt): Disregard <pre> before armor.
 +      Ignore more kinds of whitespace in mime headers.
 +      Modify the decrypted mime part's mime type so it will be displayed
 +      by default when visiting this message again.
 +
 +      * net/browse-url.el (browse-url-firefox-program): Prefer IceCat, doc.
 +      (browse-url-firefox-arguments)
 +      (browse-url-firefox-startup-arguments): Doc fix.
+ 2015-04-05  Artur Malabarba  <bruce.connor.am@gmail.com>
+ 
+       * emacs-lisp/package.el: Add package-initialize to user-init-file.
+       (package--ensure-init-file): New function.
+       (package-install, package-install-from-buffer): Use it.
  
  2015-04-05  Pete Williamson  <petewil@chromium.org>  (tiny-change)