# HG changeset patch
# User Volker Grabsch <vog@notjusthosting.com>
# Date 1332944567 -7200
# Node ID e56341d7a2df136d885b0d66b8a3461d685ef885
# Parent  fe146de226fee69e112f6a8f8f0efc6f462e0aaa
Use Git terminology in docs to avoid confusion

diff -r fe146de226fe -r e56341d7a2df doc/index.html
--- a/doc/index.html	Wed Mar 28 16:20:17 2012 +0200
+++ b/doc/index.html	Wed Mar 28 16:22:47 2012 +0200
@@ -506,7 +506,7 @@
         </li>
         <li>
             After a successful testing phase, the whole "master"
-            branch will be merged (moved) into "stable".
+            branch will be merged into "stable" (fast-forward).
         </li>
     </ul>
 </div>