Merge from emacs-24; up to 2014-05-08T06:58:46Z!rgm@gnu.org

diff --cc test/ChangeLog
index 5cb8aae8c1f9bb36de9c61c85748aa09d094b40a,443479b099e36dba634c54597291c669aff06e72..d033548215ba81176844a2fdceff7133b29f1e23
--- 1/test/ChangeLog
--- 2/test/ChangeLog
+++ b/test/ChangeLog
@@@ -1,14 -1,15 +1,15 @@@
  2014-05-08  Glenn Morris  <rgm@gnu.org>
  
        * automated/vc-bzr.el (vc-bzr-test-bug9726, vc-bzr-test-bug9781)
-       (vc-bzr-test-faulty-bzr-autoloads): Disable bzr logging.
+       (vc-bzr-test-faulty-bzr-autoloads):
+       Give bzr a temporary home-directory, in case the real one is missing.
  
 -2014-05-05  Dmitry Gutov  <dgutov@yandex.ru>
 +2014-05-08  Dmitry Gutov  <dgutov@yandex.ru>
  
 -      * automated/ruby-mode-tests.el
 -      (ruby-interpolation-after-dollar-sign): New test.
 +      * automated/ruby-mode-tests.el (ruby-interpolation-after-dollar-sign):
 +      New test.
  
 -2014-05-05  Glenn Morris  <rgm@gnu.org>
 +2014-05-08  Glenn Morris  <rgm@gnu.org>
  
        * automated/help-fns.el: New file.