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

[Robert Scheck]

commit 5ddf6a2edc1af5e5a18fa0d8409b13e907fcc2ff
Merge: 8880f26 6212903
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Feb 23 17:53:48 2013 +0100

    Merge remote branch 'origin/master' into el6

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