The branch, master has been updated
       via  b122e4527af1666a24969950c5053d0e8b3ac868 (commit)
       via  1052956cc908936cc0f301a9f47bd7a2a1aaaed8 (commit)
       via  23da6a6e1ababe74c9db0b781cb7c3d65c890814 (commit)
       via  2e7f9b3cfacb49ba1f928f50e363c845af894575 (commit)
       via  fee00e61aa505a83b097021e3f8e3c6f4dd37b67 (commit)
      from  d17fba309c11bcda59d74f238d75a56c543393f0 (commit)


- Log -----------------------------------------------------------------
commit b122e4527af1666a24969950c5053d0e8b3ac868
Merge: d17fba309c11bcda59d74f238d75a56c543393f0 
1052956cc908936cc0f301a9f47bd7a2a1aaaed8
Author: Michal Čihař <[email protected]>
Date:   Mon Aug 30 09:57:37 2010 +0200

    Merge branch 'QA_3_3'
    
    Conflicts:
        pdf_pages.php

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

Summary of changes:


hooks/post-receive
-- 
phpMyAdmin

------------------------------------------------------------------------------
Sell apps to millions through the Intel(R) Atom(Tm) Developer Program
Be part of this innovative community and reach millions of netbook users 
worldwide. Take advantage of special opportunities to increase revenue and 
speed time-to-market. Join now, and jumpstart your future.
http://p.sf.net/sfu/intel-atom-d2d
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git

Reply via email to