Merge branch 'maint' to sync with 1.7.2.2

diff --git a/t/t0006-date.sh b/t/t0006-date.sh
index b2df4fe102454daa62c5c8247128d7f22f7e6ea9..1d4d0a5c7d2549c67334a8d5dd3f462962db81f2 100755 (executable)
--- a/t/t0006-date.sh
+++ b/t/t0006-date.sh
@@ -39,7 +39,7 @@ check_parse 2008-02 bad
 check_parse 2008-02-14 bad
 check_parse '2008-02-14 20:30:45' '2008-02-14 20:30:45 +0000'
 check_parse '2008-02-14 20:30:45 -0500' '2008-02-14 20:30:45 -0500'
-check_parse '2008-02-14 20:30:45' '2008-02-14 20:30:45 -0500' EST
+check_parse '2008-02-14 20:30:45' '2008-02-14 20:30:45 -0500' EST5
 
 check_approxidate() {
        echo "$1 -> $2 +0000" >expect