d29ebe1 Merge branch 'master' of ssh://pkgs.fedoraproject.org/calibre

Merged and Committed by kevin 11 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/calibre
    
    Conflicts:
    	calibre.spec
    
        
file added
+13
file modified
+11 -1