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

[Robert Scheck]

commit 189a9e372b8f2a5f6f3a56dc2ab208cdf3e3c9a4
Merge: 45d31f1 0e7664a
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Jun 13 16:11:52 2011 +0200

    Merge remote branch 'origin/master' into el6

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