Merge branch 'maint' to sync with 1.7.2.2

diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email
index 11e51ec10d18d2c3d51c6a8b804c448059da9bfb..00850864371e16d1fa572b0d0e5832b8a88d8666 100755 (executable)
--- a/contrib/hooks/post-receive-email
+++ b/contrib/hooks/post-receive-email
@@ -214,7 +214,7 @@ generate_email_header()
        # Generate header
        cat <<-EOF
        To: $recipients
-       Subject: ${emailprefix}$projectdesc $refname_type, $short_refname, ${change_type}d. $describe
+       Subject: ${emailprefix}$projectdesc $refname_type $short_refname ${change_type}d. $describe
        X-Git-Refname: $refname
        X-Git-Reftype: $refname_type
        X-Git-Oldrev: $oldrev