09db76b Merge branch 'master' of ssh://pkgs.fedoraproject.org/uptimed

Merged and Committed by ttorcz 11 years ago
1 file changed. 3 lines added. 0 lines removed.
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/uptimed
    
    Conflicts:
    	uptimed.spec
    
        
file modified
+3 -0