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

[Toshio くらとみ]

commit 27702928028b19fbc9a04c3eaa004b3fe5c28517
Merge: 7b9cde3 87653c1
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Mon Jan 14 10:06:14 2013 -0800

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

 .gitignore   |    1 +
 calibre.spec |    7 +++++--
 sources      |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --cc calibre.spec
index cc5b9ac,6864bb0..4a237ce
--- a/calibre.spec
+++ b/calibre.spec
@@@ -1,8 -1,8 +1,8 @@@
  %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
  
  Name:           calibre
- Version:        0.9.13
+ Version:        0.9.14
 -Release:        1%{?dist}
 +Release:        2%{?dist}
  Summary:        E-book converter and library management
  Group:          Applications/Multimedia
  License:        GPLv3
@@@ -286,9 -279,9 +286,12 @@@ gtk-update-icon-cache %{_datadir}/icons
  %{python_sitelib}/init_calibre.py*
  
  %changelog
- * Mon Jan 14 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 0.9.13-2
++* 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
+ 
  * Fri Jan 04 2013 Kevin Fenzi <kevin at scrye.com> 0.9.13-1
  - Update to 0.9.13