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

[Robert Scheck]

commit 85060c468eedb4a0f1239640663f8aa36e3e7515
Merge: cd1f788 d5eaf4d
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Nov 5 07:33:56 2011 +0100

    Merge remote branch 'origin/master' into el6

 .gitignore                     |    2 +-
 phpMyAdmin-3.4.7-gettext.patch |   29 +++++++++++++++++++++++++++++
 phpMyAdmin.spec                |   21 ++++++++++++++++++++-
 sources                        |    2 +-
 4 files changed, 51 insertions(+), 3 deletions(-)
---