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

[Robert Scheck]

commit 7c3a70fbf9ee0846336fbdc134c7602c7c625d59
Merge: 189a9e3 faeffdd
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Wed Jul 6 19:03:20 2011 +0200

    Merge remote branch 'origin/master' into el6

 .gitignore      |    2 +-
 phpMyAdmin.spec |    5 ++++-
 sources         |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---