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

[Robert Scheck]

commit c1690989db793d2f76a4b25d53979581bd9dd356
Merge: ed26e2e 313c537
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Apr 8 23:23:23 2012 +0200

    Merge remote branch 'origin/master' into el6

 .gitignore      |    2 +-
 phpMyAdmin.spec |   10 ++++++++--
 sources         |    2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)
---