Merge from trunk

This commit is contained in:
Charles Haley 2010-09-19 21:06:29 +01:00
commit c72ab5fa84

View File

@ -2,7 +2,7 @@ __license__ = 'GPL v3'
__copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
__docformat__ = 'restructuredtext en'
__appname__ = 'calibre'
__version__ = '0.7.19'
__version__ = '0.7.900'
__author__ = "Kovid Goyal <kovid@kovidgoyal.net>"
import re