Merge tag 'v1.8.4' into fc/master
authorFelipe Contreras <felipe.contreras@gmail.com>
Fri, 23 Aug 2013 22:21:03 +0000 (17:21 -0500)
committerFelipe Contreras <felipe.contreras@gmail.com>
Fri, 23 Aug 2013 22:32:43 +0000 (17:32 -0500)
commitad24c0314907c54d75ab339911410fc848728718
tree24ecea5c9d2f417625fdddbe349b223b937956ff
parentcd4c2ec6c684dec68870013899868268862c387d
parente230c568c4b9a991e3175e5f65171a566fd8e39c
Merge tag 'v1.8.4' into fc/master

Git 1.8.4

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Conflicts:
contrib/remote-helpers/test-bzr.sh
contrib/remote-helpers/test-hg.sh
git-remote-bzr.py
git-remote-hg.py
git-remote-testgit.sh
t/t5801-remote-helpers.sh
transport-helper.c
.gitignore
Documentation/git-fast-export.txt
Makefile
builtin/fast-export.c
fast-import.c
git-remote-bzr.py
t/Makefile
t/t5801-remote-helpers.sh
t/t9350-fast-export.sh
transport-helper.c