[calibre: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/calibre

[Kevin Fenzi]

commit d29ebe1dfee44f8b5b800f506a4c292c9244220d
Merge: 9f54fde 2770292
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Tue Jan 22 13:48:50 2013 -0700

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

 calibre-pillow.patch |   13 +++++++++++++
 calibre.spec         |   12 +++++++++++-
 2 files changed, 24 insertions(+), 1 deletions(-)
---
diff --cc calibre.spec
index 2916d34,4a237ce..9a72c3f
--- a/calibre.spec
+++ b/calibre.spec
@@@ -279,9 -286,9 +286,12 @@@ gtk-update-icon-cache %{_datadir}/icons
  %{python_sitelib}/init_calibre.py*
  
  %changelog
 +* Tue Jan 22 2013 Kevin Fenzi <kevin at scrye.com> 0.9.15-1
 +- Update to 0.9.15
 +
+ * Mon Jan 14 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 0.9.14-2
+ - Fix import of PIL in bundled textile so it will work with python-pillow
+ 
  * Fri Jan 11 2013 Kevin Fenzi <kevin at scrye.com> 0.9.14-1
  - Update to 0.9.14