a7c89d0 Merge remote branch 'origin/master' into el4

Merged and Committed by robert 12 years ago
    Merge remote branch 'origin/master' into el4
    
        
file modified
+1 -1
eggdrop-1.6.21-no_libdns.patch eggdrop-1.6.20-no_libdns.patch
file renamed
+12 -12
eggdrop-1.6.21-suzi_sp0011.patch eggdrop-1.6.20-suzi_sp0010.patch
file renamed
+45 -46
file modified
+21 -4
file modified
+1 -1