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

[Robert Scheck]

commit e3853946f591ac87045d9ef79abd5184b13eacc3
Merge: 9b7cf94 ac8c600
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Fri Aug 20 23:01:18 2010 +0200

    Merge remote branch 'origin/master' into el6
    
    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(-)
---