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 --combined 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
@@@ -136,7 -136,7 +136,7 @@@ and if there is not any such variable, 
  in `$GIT_DIR/remotes/<origin>` file is used.
  
  In order to determine what remote branches to fetch (and
 -optionally store in the tracking branches) when the command is
 +optionally store in the remote-tracking branches) when the command is
  run without any refspec parameters on the command line, values
  of the configuration variable `remote.<origin>.fetch` are
  consulted, and if there aren't any, `$GIT_DIR/remotes/<origin>`
@@@ -149,9 -149,9 +149,9 @@@ refs/heads/*:refs/remotes/origin/
  ------------
  
  A globbing refspec must have a non-empty RHS (i.e. must store
 -what were fetched in tracking branches), and its LHS and RHS
 +what were fetched in remote-tracking branches), and its LHS and RHS
  must end with `/*`.  The above specifies that all remote
 -branches are tracked using tracking branches in
 +branches are tracked using remote-tracking branches in
  `refs/remotes/origin/` hierarchy under the same name.
  
  The rule to determine which remote branch to merge after