[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5247-gb014b4c

[Marc Delisle]

The branch, master has been updated
       via  b014b4c661791e0e4b3728665e072efcbf5d4511 (commit)
       via  f007adce6b657aa18b8da72079e6590d884bf0b1 (commit)
      from  9de870ce87e2c0a74df2ef7272fb80be6abb006e (commit)


- Log -----------------------------------------------------------------
commit b014b4c661791e0e4b3728665e072efcbf5d4511
Merge: 9de870ce87e2c0a74df2ef7272fb80be6abb006e f007adce6b657aa18b8da72079e6590d884bf0b1
Author: Marc Delisle <marc at infomarc.info>
Date:   Thu Jul 1 07:35:39 2010 -0400

    Merge branch 'QA_3_3'

-----------------------------------------------------------------------

Summary of changes:
 Documentation.html |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Documentation.html b/Documentation.html
index 3c12424..7f19ebb 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -3368,7 +3368,7 @@ have either the <a href="http://pecl.php.net/package/APC">APC</a> extension
 
 <h4 id="login_bug">
     <a href="#login_bug">3.1 When using
-    <abbr title="HyperText Transfer Protocol">HTTP</abbr> authentication, an user
+    <abbr title="HyperText Transfer Protocol">HTTP</abbr> authentication, a user
     who logged out can not log in again in with the same nick.</a></h4>
 
 <p> This is related to the authentication mechanism (protocol) used by


hooks/post-receive
-- 
phpMyAdmin