65fdc2 Merge branch 'master' into el4

Merged and Committed by pghmcfc 9 years ago
    Merge branch 'master' into el4
    
    Conflicts:
    	.gitignore
    	proftpd.conf
    	proftpd.spec
    	sources
    
    This is a version update but it does fix a number of security issues
    and I consider the minor upheaval of the version update to be a lesser
    evil than the possibililty of getting backported security fixes wrong.
    
        
file modified
+3 -3
file modified
+33 -3
file modified
+1 -1
file modified
+64 -26
file modified
+2 -2