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

[Robert Scheck]

commit 9e983f13a78b226c3bba029c499981fb4791e48e
Merge: 36b88b8 80d624f
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Aug 29 14:37:03 2010 +0200

    Merge remote branch 'origin/master' into f12

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