8f668b9 Merge branch 'master' of ssh://pkgs.fedoraproject.org/cherokee

Merged and Committed by pali 12 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/cherokee
    
    Conflicts:
    	cherokee.spec
    
        
file modified
+3 -0