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

[Robert Scheck]

commit 61bb7f42ffd79f289f9a94e3636ec799e831d9bc
Merge: 8858b5c 0b56c01
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Tue Oct 9 12:21:38 2012 +0200

    Merge remote branch 'origin/master' into el6

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