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

[Robert Scheck]

commit 8858b5cad7074bd2608c35e9f4eef9071f468a58
Merge: 46858ee 81e83f6
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Wed Aug 15 02:13:31 2012 +0200

    Merge remote branch 'origin/master' into el6

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