Merge branch 'cn/bom-in-gitignore'

diff --git a/contrib/hooks/multimail/README.Git b/contrib/hooks/multimail/README.Git
index 129b771410cdf1cb020e634b305db8a429bf3caf..ab3ece5221b7ecbc37994139f587bb2a90ab14dd 100644 (file)
--- a/contrib/hooks/multimail/README.Git
+++ b/contrib/hooks/multimail/README.Git
@@ -3,13 +3,13 @@ section of the Git project as a convenience to Git users.
 git-multimail is developed as an independent project at the following
 website:
 
-    https://github.com/mhagger/git-multimail
+    https://github.com/git-multimail/git-multimail
 
 The version in this directory was obtained from the upstream project
-on 2014-04-07 and consists of the "git-multimail" subdirectory from
+on 2015-04-27 and consists of the "git-multimail" subdirectory from
 revision
 
-    1b32653bafc4f902535b9fc1cd9cae911325b870
+    8c3aaafa873bf10de8dddf1d202c449b3eff3b42 refs/tags/1.0.2
 
 Please see the README file in this directory for information about how
 to report bugs or contribute to git-multimail.