Merge branch 'origin' into glsl-compiler-1

Conflicts:

	src/mesa/main/context.c

1 files changed, 6 insertions, 2 deletions

diff --git a/docs/repository.html b/docs/repository.html
index d09fc1800a7..39f5da4bbe7 100644
--- a/docs/repository.html
+++ b/docs/repository.html
@@ -96,8 +96,12 @@ code while a branch has the latest stable code.
 </p>
 
 <p>
-Questions about active Mesa development branches should be posted to
-the mesa3d-dev mailing list.
+The command <code>git-branch</code> will list all available branches.
+</p>
+
+<p>
+Questions about branch status/activity should be posted to the
+mesa3d-dev mailing list.
 </p>