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

[Robert Scheck]

commit e0af4b401276db573bcdad1b8bec9eb63432885f
Merge: 9401c6b 1c5dea4
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Jul 30 22:30:01 2012 +0200

    Merge remote branch 'origin/master' into el6

 phpMyAdmin.spec |    8 +++++++-
 sources         |    2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)
---