Merge master into aw/mirror-push

diff --git a/Documentation/repository-layout.txt b/Documentation/repository-layout.txt
index 15221b53206eb65072f147ac72f556d0a1ee55e4..4c92e375fed4592f7190086dd40ef6dd1241d238 100644 (file)
--- a/Documentation/repository-layout.txt
+++ b/Documentation/repository-layout.txt
@@ -177,4 +177,3 @@ shallow::
        This is similar to `info/grafts` but is internally used
        and maintained by shallow clone mechanism.  See `--depth`
        option to gitlink:git-clone[1] and gitlink:git-fetch[1].
-