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

[Robert Scheck]

commit 13c1faf5bdc0af868db3e7d7ad310c0030c870d8
Merge: e385394 80d624f
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Aug 29 14:39:06 2010 +0200

    Merge remote branch 'origin/master' into el6

 .gitignore                    |    2 +-
 phpMyAdmin-3.3.5-mysqli.patch |   16 ----------------
 phpMyAdmin.spec               |    7 ++++---
 sources                       |    2 +-
 4 files changed, 6 insertions(+), 21 deletions(-)
---