[eggdrop/el5: 4/4] Merge remote branch 'origin/master' into el5

[Robert Scheck]

commit ace992dbf55f18d011f4fc69945c4d781d6a0ddb
Merge: 5e8d957 3d0d61c
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Jan 8 21:38:37 2012 +0100

    Merge remote branch 'origin/master' into el5

 .gitignore                                         |    2 +-
 ..._libdns.patch => eggdrop-1.6.21-no_libdns.patch |   24 +++---
 ...p0010.patch => eggdrop-1.6.21-suzi_sp0011.patch |   91 ++++++++++----------
 eggdrop.spec                                       |   25 +++++-
 sources                                            |    2 +-
 5 files changed, 80 insertions(+), 64 deletions(-)
---