[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-249-g975d465

[Marc Delisle]

The branch, master has been updated
       via  975d4650de7606de6218d5cc4fd97cc7cc825071 (commit)
       via  0f6215f70ed47a1c26743dab636fb74042d98833 (commit)
       via  e859e311496ae25e1c6de6412084bc336f0798b9 (commit)
       via  cdfc277bb7bd3b8fad0e45d9317fdd4578282206 (commit)
      from  f8fa3b4ede1e056be9ac903eb8900d1bb18db086 (commit)


- Log -----------------------------------------------------------------
commit 975d4650de7606de6218d5cc4fd97cc7cc825071
Merge: f8fa3b4ede1e056be9ac903eb8900d1bb18db086 0f6215f70ed47a1c26743dab636fb74042d98833
Author: Marc Delisle <marc at infomarc.info>
Date:   Mon Mar 22 13:25:07 2010 -0400

    Merge branch 'QA_3_3'

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

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

diff --git a/tbl_row_action.php b/tbl_row_action.php
index d72c7d5..efcc74d 100644
--- a/tbl_row_action.php
+++ b/tbl_row_action.php
@@ -43,7 +43,7 @@ if (isset($_REQUEST['submit_mult'])) {
     $submit_mult = 'row_export';
 }
 
-// garvin: If the 'Ask for confirmation' button was pressed, this can only come
+// If the 'Ask for confirmation' button was pressed, this can only come
 // from 'delete' mode, so we set it straight away.
 if (isset($_REQUEST['mult_btn'])) {
     $submit_mult = 'row_delete';


hooks/post-receive
-- 
phpMyAdmin