Merge remote-tracking branch 'upstream/master'

2015-10-22 16:17:55 +01:00
commit 9fa7b3956d
@@ -1927,8 +1927,8 @@ EOF
        ;;
    stop)
        [ $# -eq 0 ] || usage
-        stop_proxy
        stop_router
+        stop_proxy
        ;;
    stop-router)
        [ $# -eq 0 ] || usage