8a80f2c Merge branch 'master' of ssh://pkgs.fedoraproject.org/libetpan

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