[eggdrop/f13/master: 3/3] Merge remote branch 'origin/master' into f13

[Robert Scheck]

commit e402cee6019a4866a62e6c99ceff3a6dce3c0de3
Merge: 698d96f 8553a98
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Tue Dec 28 01:01:03 2010 +0100

    Merge remote branch 'origin/master' into f13
    
    Conflicts:
    	.gitignore

 .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                                       |   64 ++--
 sources                                            |    2 +-
 8 files changed, 207 insertions(+), 515 deletions(-)
---