Merge branch 'rs/maint-config-use-labs' into maint

diff --git a/contrib/subtree/.gitignore b/contrib/subtree/.gitignore
index 91360a3d7f0ad2d589dfe0365d4456d56853e7c0..0b9381abcad34e79a1cdfa129bb9b3e4e187a62e 100644 (file)
--- a/contrib/subtree/.gitignore
+++ b/contrib/subtree/.gitignore
@@ -1,6 +1,7 @@
 *~
 git-subtree
-git-subtree.xml
 git-subtree.1
+git-subtree.html
+git-subtree.xml
 mainline
 subproj