Merge branch 'maint' to sync with Git 1.7.3.3

* maint:
  Git 1.7.3.3
  CodingGuidelines: mention whitespace preferences for shell scripts
  Documentation: do not misinterpret pull refspec as bold text

Conflicts:
	Documentation/git-pull.txt
	RelNotes

diff --cc Documentation/git-pull.txt
index e47361f2345bba78c917ab58bfe61800aa1e7156,abbc3eb3e0ee208a13237cde5ae3d00d962ad62e..4db73737b044dc151baed09a3f3d17e428eb124b
--- 1/Documentation/git-pull.txt
--- 2/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@@ -26,9 -26,9 +26,9 @@@ With `--rebase`, it runs 'git rebase' i
  <repository> should be the name of a remote repository as
  passed to linkgit:git-fetch[1].  <refspec> can name an
  arbitrary remote ref (for example, the name of a tag) or even
 -a collection of refs with corresponding remote tracking branches
 +a collection of refs with corresponding remote-tracking branches
- (e.g., refs/heads/*:refs/remotes/origin/*), but usually it is
- the name of a branch in the remote repository.
+ (e.g., refs/heads/{asterisk}:refs/remotes/origin/{asterisk}),
+ but usually it is the name of a branch in the remote repository.
  
  Default values for <repository> and <branch> are read from the
  "remote" and "merge" configuration for the current branch