d7c6e9 Merge branch 'master' of ssh://pkgs.fedoraproject.org/at

Merged and Committed by Marcela Mašláňová 12 years ago
1 file changed. 5 lines added. 2 lines removed.
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/at
    
    Conflicts:
    	at.spec
    
        
file modified
+5 -2