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

[Robert Scheck]

commit af1c3ee4ce362c800b8c0cc6d174eefe210bbe51
Merge: a009449 fb3b626
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Thu Aug 25 22:24:14 2011 +0200

    Merge remote branch 'origin/master' into el6

 .gitignore                |    2 +-
 phpMyAdmin-config.inc.php |    5 +++
 phpMyAdmin.spec           |   60 +++++++++++++++++++++++++++++---------------
 sources                   |    2 +-
 4 files changed, 46 insertions(+), 23 deletions(-)
---