From 025fd692024e08e1a34a798fbe05f8481ef43dd1 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 10 Nov 2017 07:14:37 +0530
Subject: [PATCH] version 3.12.0

---
 Changelog.yaml           | 25 +++++++++++++++++++++++++
 src/calibre/constants.py |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/Changelog.yaml b/Changelog.yaml
index 7da50df857..7754ec2d67 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -20,6 +20,31 @@
 #   new recipes:
 #     - title:
 
+- version: 3.12.0
+  date: 2017-11-09
+
+  new features:
+    - title: "Driver for the new Nook Glowlight 3"
+      tickets: [1731024]
+
+    - title: "Allow configuring the metadata fields displayed in the popup book details window. To configure, simply click the 'Configure' link at the bottom of the window."
+
+    - title: "Wireless driver: Allow specifying extra file formats (unknown to calibre) to send"
+
+  bug fixes:
+    - title: "Fix a regression that caused clicking the clear button in the main search bar to not unapply the current search until enter is pressed."
+
+    - title: "Linux: Fix a regression causing calibre to fail to start on systems with no DBUS session bus"
+
+    - title: "Browser viewer: Fix body font being forced to sans-serif, overriding in book and user stylesheet settings"
+
+    - title: "Fix sending email failing of the computer's FQDN is set to a single period."
+      tickets: [1730166]
+
+  improved recipes:
+    - New Yorker
+    - Geopolityka
+
 
 - version: 3.11.1
   date: 2017-11-02
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index f1b0470270..80a21669a1 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -6,7 +6,7 @@ from future_builtins import map
 import sys, locale, codecs, os, importlib, collections
 
 __appname__   = u'calibre'
-numeric_version = (3, 11, 1)
+numeric_version = (3, 12, 0)
 __version__   = u'.'.join(map(unicode, numeric_version))
 __author__    = u"Kovid Goyal <kovid@kovidgoyal.net>"