[phpMyAdmin/f12/master: 12/12] Merge remote branch 'origin/master' into f12

[Robert Scheck]

commit 36b88b848699ee833f92481339e1a47c863843a3
Merge: 6ef7e51 ac8c600
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Fri Aug 20 22:58:22 2010 +0200

    Merge remote branch 'origin/master' into f12
    
    Conflicts:
    	.gitignore
    	phpMyAdmin.spec
    	sources

 .gitignore                    |    2 +-
 phpMyAdmin-3.3.5-mysqli.patch |   16 ++++++++++++++++
 phpMyAdmin.spec               |    8 +++++++-
 sources                       |    2 +-
 4 files changed, 25 insertions(+), 3 deletions(-)
---