Merge branch 'sb/submodule-parallel-fetch' of git://github.com/gitster/git into devel
commitb55431ddc21306e9afd949e1088be6f3f265ccd4
authorJohannes Sixt <j6t@kdbg.org>
Tue, 10 Nov 2015 09:13:07 +0000 (10 10:13 +0100)
committerJohannes Sixt <j6t@kdbg.org>
Tue, 10 Nov 2015 09:13:07 +0000 (10 10:13 +0100)
treefd851ce6037d2aacab44c837dd1fa20320ad610d
parent11a3d9f079fbe50ea05e907998284965c62f7f70
parent6f963a895a97d720c909fcf4eb0544a272ef7c49
Merge branch 'sb/submodule-parallel-fetch' of git://github.com/gitster/git into devel

# Conflicts:
# run-command.c
builtin/fetch.c
builtin/pull.c
git-compat-util.h
run-command.c
run-command.h
strbuf.c
strbuf.h
submodule.c
wrapper.c