[git/el5: 64/64] Merge remote-tracking branch 'origin/master' into el5

[Adam Tkac]

commit c847a30642e4d85012aff32c4dd302f2c1a84020
Merge: c2f736a 166c9f3
Author: Adam Tkac <atkac at redhat.com>
Date:   Tue Feb 26 11:47:11 2013 +0100

    Merge remote-tracking branch 'origin/master' into el5

 .gitignore                                         |    2 +-
 ...STDIR-support-in-contrib-subtree-Makefile.patch |   32 ++
 git-1.6-update-contrib-hooks-path.patch            |   43 --
 git.spec                                           |  456 ++++++++++++++++----
 sources                                            |    2 +-
 5 files changed, 417 insertions(+), 118 deletions(-)
---