[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_5_0BETA1-16-gd7082cd

25 Jan 2012

      The branch, master has been updated
       via  d7082cd85659dd8f7279fee9e83c507eafcef2ce (commit)
       via  5289db8dd474bc33af3bcf20688c6d0d4359eb0a (commit)
      from  112d692a3f7bfa69c9d2c7d8e68ec06f3aafa006 (commit)

- Log -----------------------------------------------------------------
commit d7082cd85659dd8f7279fee9e83c507eafcef2ce
Merge: 112d692 5289db8
Author: Madhura Jayaratne <madhura.cj@gmail.com>
Date:   Wed Jan 25 23:38:33 2012 +0530

    Merge branch 'QA_3_5'

    Conflicts:
    	ChangeLog
    	Documentation.html
    	README
    	libraries/Config.class.php

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

Summary of changes:

hooks/post-receive
-- 
phpMyAdmin