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

[Robert Scheck]

commit 70313539050ef3a222da6284e42497dd2561f095
Merge: 2a30f3c 3de1522
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Dec 4 14:10:19 2011 +0100

    Merge remote branch 'origin/master' into el6

 .gitignore                     |    2 +-
 phpMyAdmin-3.4.7-gettext.patch |   29 -----------------------------
 phpMyAdmin.spec                |    7 ++++---
 sources                        |    2 +-
 4 files changed, 6 insertions(+), 34 deletions(-)
---