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

[Robert Scheck]

commit ed26e2edea5aa0aa557021daf00bd35488f9bc2d
Merge: 7031353 2b2c27f
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Thu Dec 22 22:33:18 2011 +0100

    Merge remote branch 'origin/master' into el6

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