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

[Robert Scheck]

commit 21b97ef35cc99a18f8ed00caeafd2a2dde027cca
Merge: bcf9bc7 a583b12
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Feb 13 03:34:53 2011 +0100

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

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