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

[Robert Scheck]

commit 289379933f3f8ebe62aba3704fe59fe33d3b0b38
Merge: a50323a c3ae56d
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Nov 29 22:58:56 2010 +0100

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

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