6f5ffbb Merge branch 'master' of ssh://pkgs.fedoraproject.org/bandwidthd

Merged and Committed by Jan ONDREJ (SAL) 12 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/bandwidthd
    
    Conflicts:
    	bandwidthd.spec
    
        
file modified
+5 -2