[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3RC1-2927-gbcf9a3a

[Michal Čihař]

The branch, master has been updated
       via  bcf9a3a5f30846296b530a819430d3208f1f368d (commit)
       via  5227d998ec1d59d7f980ad793ddf807f7a58ac3e (commit)
      from  06cb15eab79f85ae5cff918736eaccd928526dca (commit)


- Log -----------------------------------------------------------------
commit bcf9a3a5f30846296b530a819430d3208f1f368d
Merge: 06cb15eab79f85ae5cff918736eaccd928526dca 5227d998ec1d59d7f980ad793ddf807f7a58ac3e
Author: Michal Čihař <michal at cihar.com>
Date:   Mon May 10 07:42:50 2010 +0200

    Merge branch 'QA_3_3'
    
    Conflicts:
    	libraries/display_import.lib.php

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

Summary of changes:


hooks/post-receive
-- 
phpMyAdmin