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

[Robert Scheck]

commit 21e84c06f7d2bf6cf74e23635a7a755ac8c0c5e4
Merge: 13c1faf ca4fab0
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Wed Sep 8 23:21:12 2010 +0200

    Merge remote branch 'origin/master' into el6

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