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

[Robert Scheck]

commit a0094495779c4bb501ff7ef68aec5574532ce03f
Merge: 7c3a70f 8e020e3
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Jul 25 22:39:55 2011 +0200

    Merge remote branch 'origin/master' into el6

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