458456f Merge branch 'master' of ssh://pkgs.fedoraproject.org/libotr

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