From: Jay Belanger <jay.p.belanger@gmail.com>
Date: Sun, 16 Nov 2014 05:27:48 +0000 (-0600)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
X-Git-Tag: emacs-25.0.90~2635^2~458
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bc5d86fe909e2808194bc738c8086599245f22c5;p=emacs.git

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

Conflicts:
	lisp/ChangeLog
---

bc5d86fe909e2808194bc738c8086599245f22c5
diff --cc lisp/ChangeLog
index 9a9e4310851,2fabb8eade1..1c49034665c
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,8 -1,23 +1,29 @@@
 +2014-11-16  Thierry Banel <tbanelwebmin@free.fr>  (tiny change)
 +
 +	* calc/calc-arith.el (math-max-list, math-min-list): Fix bug
 +	for date handling.
 +
+ 2014-11-16  Andreas Schwab  <schwab@linux-m68k.org>
+ 
+ 	* version.el (emacs-repository-get-version): Use git rev-parse
+ 	instead of git log.
+ 
+ 2014-11-16  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+ 
+ 	* progmodes/python.el (python-indent-calculate-levels):
+ 	Fix indentation behavior multiline dedenter statement.  (Bug#18432)
+ 
+ 2014-11-16  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+ 
+ 	* progmodes/python.el (python-indent-region):
+ 	Use python-indent-line and skip special cases.  (Bug#18843)
+ 
+ 2014-11-16  Peder O. Klingenberg  <peder@klingenberg.no>  (tiny change)
+ 
+ 	* mail/emacsbug.el (report-emacs-bug): Make a better guess at
+ 	  envelope-from when reporting through sendmail (bug#19054).
++>>>>>>> 1a713024a012f574d16084cf42703e6ef49473cf
+ 
  2014-11-16  Oscar Fuentes <ofv@wanadoo.es>
  
  	Add faces for the VC modeline state indicator.