Merge from trunk; up to 2014-02-23T23:41:17Z!lekktu@gmail.com.

diff --cc lisp/mh-e/ChangeLog
index 74cab44,90a19c5..b4e9402
--- 1/lisp/mh-e/ChangeLog
--- 2/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@@ -1,12 -1,31 +1,40 @@@
 +2014-02-24  Bill Wohler  <wohler@newt.com>
 +
 +      * mh-folder.el (mh-regenerate-headers): Fix scan: bad message list
 +      `unseen' error (closes SF #471).
 +
+ 2013-11-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * mh-print.el (mh-ps-print-preprint): Don't use dynamic-var
+       `prefix-arg' as function argument.
+ 
+ 2013-06-18  Juri Linkov  <juri@jurta.org>
+ 
+       * mh-alias.el (mh-alias-local-users): Add non-nil arg REPLACE to
+       the call of `shell-command-on-region'.  (Bug#14637)
+ 
+ 2013-05-22  Glenn Morris  <rgm@gnu.org>
+ 
+       * mh-speed.el (mh-speed-view):
+       Use dframe-with-attached-buffer rather than speedbar- alias.
+ 
+ 2013-05-21  Glenn Morris  <rgm@gnu.org>
+ 
+       * mh-comp.el (mh-regexp-in-field-p): Fix previous change.
+ 
+ 2013-05-09  Glenn Morris  <rgm@gnu.org>
+ 
+       * mh-e.el (mh-sortm-args, mh-default-folder-for-message-function):
+       Fix custom types.
+ 
+ 2013-05-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * mh-comp.el (mh-regexp-in-field-p): Minor simplification.
+ 
 +2013-03-03  Bill Wohler  <wohler@newt.com>
 +
 +      * mh-e.el (mh-version): Add +bzr to version.
 +
  2013-03-02  Bill Wohler  <wohler@newt.com>
  
        Release MH-E version 8.5.

diff --cc lisp/mh-e/mh-e.el
Simple merge

diff --cc lisp/mh-e/mh-folder.el
Simple merge

diff --cc lisp/mh-e/mh-thread.el
Simple merge