Merge tag 'v1.8.4.2' into fc/master
authorFelipe Contreras <felipe.contreras@gmail.com>
Tue, 29 Oct 2013 07:31:42 +0000 (01:31 -0600)
committerFelipe Contreras <felipe.contreras@gmail.com>
Tue, 29 Oct 2013 07:45:24 +0000 (01:45 -0600)
commit6f876daf2fe474b132cf1ba3a6cdc1b20459e2c3
tree2ceb9a00fa336fda4d7a42b559fac59ed60531a7
parentf775df0c8f8748a99391148f8d709ce1ba0bd277
parentdcb11cca50992339af744e25ca5d0f94b478d3b9
Merge tag 'v1.8.4.2' into fc/master

Git 1.8.4.2

Conflicts:
GIT-VERSION-GEN
shortlog.c
t/t3200-branch.sh
Documentation/config.txt
Documentation/git-branch.txt
branch.c
cache.h
environment.c
shortlog.c
t/t3200-branch.sh
t/t5601-clone.sh
t/test-lib.sh