[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_5_0BETA1-1040-g1b0aa84

[Michal Čihař]

The branch, master has been updated
       via  1b0aa840dee90652d87981bbbd8f512f906a45f1 (commit)
       via  a01fc09ccfa16945025e103a1a6d6d9d51e1bdc2 (commit)
      from  df7f43750c99998e557d77a513e2b4d441e84c80 (commit)


- Log -----------------------------------------------------------------
commit 1b0aa840dee90652d87981bbbd8f512f906a45f1
Merge: df7f437 a01fc09
Author: Michal Čihař <mcihar at suse.cz>
Date:   Wed Feb 1 10:01:56 2012 +0100

    Merge remote-tracking branch 'origin/QA_3_5'

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

Summary of changes:
 test/classes/PMA_Theme_Manager_test.php |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/test/classes/PMA_Theme_Manager_test.php b/test/classes/PMA_Theme_Manager_test.php
index 02a2f1b..772ed50 100644
--- a/test/classes/PMA_Theme_Manager_test.php
+++ b/test/classes/PMA_Theme_Manager_test.php
@@ -48,4 +48,3 @@ class PMA_Theme_Manager_test extends PHPUnit_Framework_TestCase
 
 }
 ?>
-


hooks/post-receive
-- 
phpMyAdmin