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

[Robert Scheck]

commit 273fae35c57fb156b7984f5fc9da0337ddf37f36
Merge: b492254 a42f103
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Thu Apr 25 22:38:08 2013 +0200

    Merge remote branch 'origin/master' into el6

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