Merge branch 'master' of git://repo.or.cz/git/mingw into devel
commit562a80c7f44111b6564f49cce1df1a1ef2567d26
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Thu, 5 Mar 2009 17:37:12 +0000 (5 18:37 +0100)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Thu, 5 Mar 2009 17:37:12 +0000 (5 18:37 +0100)
treecad306be777e28acc3abc19902bb66037ffa2a2a
parent96fd02ed68fb068ba75d980bcd280bbdb5169bba
parent2c84209028da11c0a3547ad5bfa3d266e4fe0a77
Merge branch 'master' of git://repo.or.cz/git/mingw into devel

Conflicts:
t/t5505-remote.sh
test-path-utils.c

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Makefile
t/t5505-remote.sh
t/t9500-gitweb-standalone-no-errors.sh
t/test-lib.sh