From 4e3ca208799c08eefdc9713287073477004716dc Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 1 Jan 2016 09:24:08 +0530
Subject: [PATCH] version 2.48.0

---
 Changelog.yaml           | 36 +++++++++++++++++++++++++++++++++++-
 src/calibre/constants.py |  2 +-
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/Changelog.yaml b/Changelog.yaml
index 2fba2bc3b2..30f0c74ed7 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -6,7 +6,7 @@
 # Also, each release can have new and improved recipes.
 
 # - version: ?.?.?
-#   date: 2015-??-??
+#   date: 2016-??-??
 #
 #   new features:
 #     - title: 
@@ -20,6 +20,40 @@
 #   new recipes:
 #     - title: 
 
+- version: 2.48.0
+  date: 2016-01-01
+
+  new features:
+    - title: "Driver for Energy Ereader Screenlight."
+      tickets: [1529108]
+
+    - title: "DOCX Input: Add option to have superscripts/subscripts converted so that they do not affect the line height of the line containing them."
+      tickets: [1528055]
+
+    - title: "New option to hide empty categories in Tag Browser (Preferences->Look & Feel->Tag Browser)"
+
+  bug fixes:
+    - title: "Image compression: Fix spurious zero byte .bak files being created when compressing png images inside epub files"
+
+    - title: "Image compression: Fix bug that could cause zero byte images files/or file in use errors when compressing images"
+
+    - title: "Fix some icons not being themeable"
+      tickets: [1529501]
+
+    - title: "E-book viewer: When using heuristics to detect footnote links check for vertical-align set to top and bottom as well as sub and super"
+
+    - title: "Book details panel: Display data in right-to-left format when the calibre interface language is set to a right-to-left language such as Hebrew or Arabic"
+
+  improved recipes:
+    - Rzeczpospolita
+    - New York Times Book Review
+    - der Standard
+    - More Intelligent Life
+    - Reader's Digest
+    - Financial Times
+    - New Scientist
+
+
 - version: 2.47.0
   date: 2015-12-21
 
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index 84591e06f0..81c19295b5 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -4,7 +4,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = u'calibre'
-numeric_version = (2, 47, 0)
+numeric_version = (2, 48, 0)
 __version__   = u'.'.join(map(unicode, numeric_version))
 __author__    = u"Kovid Goyal <kovid@kovidgoyal.net>"