9ab658 Merge branch 'master' into f16

Merged and Committed by pghmcfc 8 years ago
    Merge branch 'master' into f16
    
    Conflicts:
    	proftpd.service
    	proftpd.spec
    
        
file modified
+1 -1
file modified
+5 -3
file modified
+111 -34