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

[Robert Scheck]

commit bcf9bc7c41a714b21a11537acd2c1d6165a0e99a
Merge: 2893799 2118c75
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Thu Feb 10 23:52:37 2011 +0100

    Merge remote branch 'origin/el5/master' into el4

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