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

diff --cc lisp/ChangeLog
index e0891e1947c2ff290a7771e415a785d86a5bbfad,5004924e9d30c2b9d34c717f0036135ce27863c4..a9cf1b0f88fef3584303bafb4a1057edf3ed06ea
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,11 -1,9 +1,15 @@@
 +2015-03-14  Michael R. Mauger  <michael@mauger.com>
 +
 +      * progmodes/sql.el: Version 3.5
 +      (sql-starts-with-prompt-re, sql-ends-with-prompt-re): Match password prompts.
 +      (sql-interactive-remove-continuation-prompt): Fixed regression. (Bug#6686)
 +
  2015-03-14  Daniel Colascione  <dancol@dancol.org>
  
+       * widget.el (define-widget): Check that documentation is a string
+       or nil; prevent wailing and gnashing of teeth when users forget to
+       pass a docstring and wonder why their properties don't work.
+ 
        * startup.el (command-line): Process "--no-x-resources".
  
  2015-03-13  Kevin Ryde  <user42_kevin@yahoo.com.au>