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

Merged and Committed by toshio 11 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/calibre
    
    Conflicts:
    	calibre.spec
    
        
file modified
+1 -0
file modified
+5 -2
file modified
+1 -1