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

[Robert Scheck]

commit 5e8d9575e49e37aa85af314fb195ce81d13b3204
Merge: a21faa9 8553a98
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Tue Dec 28 01:05:32 2010 +0100

    Merge remote branch 'origin/master' into el5
    
    Conflicts:
    	.gitignore
    	eggdrop-1.6.19-conf.patch
    	eggdrop.spec
    	sources

 .gitignore                                         |    2 +-
 eggdrop-1.6.19-conf.patch                          |   12 -
 eggdrop-1.6.19-ctcpfix.patch                       |   51 --
 eggdrop-1.6.19-no_libdns.patch                     |   16 -
 eggdrop-1.6.20-no_libdns.patch                     |   69 +++
 ...p0007.patch => eggdrop-1.6.20-suzi_sp0010.patch |  506 ++++----------------
 eggdrop.spec                                       |   72 ++--
 sources                                            |    2 +-
 8 files changed, 214 insertions(+), 516 deletions(-)
---