From ab72066ad6a87c4c44391b9324dfd6638c98d1a5 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Fri, 10 Jun 2016 09:50:41 -0400
Subject: [PATCH] Preparation for release 2.3.12

---
 Documentation/docinfo.xml                         | 6 +++---
 Documentation/includes/global-attributes.asciidoc | 2 +-
 NEWS                                              | 3 ++-
 Version                                           | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Documentation/docinfo.xml b/Documentation/docinfo.xml
index 11ea2705a..376b94eb4 100644
--- a/Documentation/docinfo.xml
+++ b/Documentation/docinfo.xml
@@ -1,7 +1,7 @@
 <!-- TODO have the build system take care of this  -->
-<releaseinfo>Version 2.3.11 - May 2016</releaseinfo>
-<subtitle>for version 2.3.11</subtitle>
-<date>2016-05-12</date>
+<releaseinfo>Version 2.3.12 - June 2016</releaseinfo>
+<subtitle>for version 2.3.12</subtitle>
+<date>2016-06-10</date>
 
 <legalnotice>
   <para>Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled "GNU Free Documentation License".</para>
diff --git a/Documentation/includes/global-attributes.asciidoc b/Documentation/includes/global-attributes.asciidoc
index 3488cc98a..e66812513 100644
--- a/Documentation/includes/global-attributes.asciidoc
+++ b/Documentation/includes/global-attributes.asciidoc
@@ -13,6 +13,6 @@
 
 // TODO have the build system take care of this
 
-:release_version: 2.3.11
+:release_version: 2.3.12
 
 // vim: set syntax=asciidoc tabstop=2 shiftwidth=2 expandtab:
diff --git a/NEWS b/NEWS
index 125bdbe9f..bd153f707 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-2.3.12 (2016-XX-YY)
+2.3.12 (2016-06-10)
 -------------------
 
 Enhancements
@@ -6,6 +6,7 @@ Enhancements
  - [web] CKEditor: switched to the minimalist skin
  - [web] CKEditor: added the base64image plugin
  - [web] CKEditor: added the pastefromword plugin (#2295, #3313)
+ - [web] added Turkish (Turkey) (tr_TR) translation - thanks to Sinan Kurşunoğlu
 
 Bug fixes
  - [core] sanity checks for events with bogus timezone offsets
diff --git a/Version b/Version
index 212d80316..0763962ef 100644
--- a/Version
+++ b/Version
@@ -4,4 +4,4 @@
 
 MAJOR_VERSION=2
 MINOR_VERSION=3
-SUBMINOR_VERSION=11
+SUBMINOR_VERSION=12