Merge branch 'maint-1.6.0' into maint

diff --git a/t/t5100/sample.mbox b/t/t5100/sample.mbox
index 38725f38d2ab1dca07efb12b587fb0bf8a2cf16b..c5ad206b40e1fcf79019cebdfd848d72c17cefcc 100644 (file)
--- a/t/t5100/sample.mbox
+++ b/t/t5100/sample.mbox
@@ -2,10 +2,10 @@
        
     
 From nobody Mon Sep 17 00:00:00 2001
-From: A
+From: A (zzz)
       U
       Thor
-      <a.u.thor@example.com>
+      <a.u.thor@example.com> (Comment)
 Date: Fri, 9 Jun 2006 00:44:16 -0700
 Subject: [PATCH] a commit.
 
@@ -556,3 +556,8 @@ index 3fd3afb..0ee807e 100644
  #. на своей машине: отредактировать /etc/sudoers (команда ``visudo``) примерно следующим образом::
 -- 
 1.5.6.5
+From nobody Mon Sep 17 00:00:00 2001
+From: <a.u.thor@example.com> (A U Thor)
+Date: Fri, 9 Jun 2006 00:44:16 -0700
+Subject: [PATCH] a patch
+