[phpMyAdmin/el4: 2/2] Merge remote branch 'origin/el5' into el4

[Robert Scheck]

commit 454263e45615e9567c2fb4c3792b5c09d7fb6a15
Merge: 21b97ef 420eec5
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Tue Jul 26 22:04:22 2011 +0200

    Merge remote branch 'origin/el5' into el4

 phpMyAdmin-2.11.11.3-magic-quotes.patch |   17 ++++++
 phpMyAdmin.htaccess                     |   21 +++++--
 phpMyAdmin.spec                         |   92 ++++++++++++++++---------------
 3 files changed, 79 insertions(+), 51 deletions(-)
---