Merge branch 'maint' to sync with GIT 1.6.0.6

diff --git a/git-web--browse.sh b/git-web--browse.sh
index 384148a59fc492d8fb1d6ea4fc4532aa1e5ffc22..78d236b77f6e2b52d89bf7b579762723ede86d15 100755 (executable)
--- a/git-web--browse.sh
+++ b/git-web--browse.sh
@@ -31,7 +31,7 @@ valid_custom_tool()
 
 valid_tool() {
        case "$1" in
-               firefox | iceweasel | konqueror | w3m | links | lynx | dillo | open)
+               firefox | iceweasel | konqueror | w3m | links | lynx | dillo | open | start)
                        ;; # happy
                *)
                        valid_custom_tool "$1" || return 1
@@ -114,6 +114,10 @@ if test -z "$browser" ; then
     if test -n "$SECURITYSESSIONID"; then
        browser_candidates="open $browser_candidates"
     fi
+    # /bin/start indicates MinGW
+    if test -n /bin/start; then
+       browser_candidates="start $browser_candidates"
+    fi
 
     for i in $browser_candidates; do
        init_browser_path $i
@@ -157,7 +161,7 @@ case "$browser" in
                ;;
        esac
        ;;
-    w3m|links|lynx|open)
+    w3m|links|lynx|open|start)
        eval "$browser_path" "$@"
        ;;
     dillo)