eff891c Merge remote branch 'origin/master' into f14

Merged and Committed by Kevin Fenzi 13 years ago
    Merge remote branch 'origin/master' into f14
    Updated to 0.7.18 and requires new python-cssutils
    Conflicts:
    	calibre.spec
    
        
file modified
+8 -0
file modified
+40 -9
file modified
+1 -1