From be724756b9624a72dda0c6235535dd78f6543e0e Mon Sep 17 00:00:00 2001
From: Martin Mahner <martin@mahner.org>
Date: Sun, 8 Jun 2014 20:31:51 +0200
Subject: [PATCH] Changelog update and 2.6 Release

---
 CHANGELOG | 9 +++++++++
 setup.py  | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index f113921..89d8bff 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,15 @@
 Changelog
 =========
 
+2.7 (2014-06-08)
+----------------
+
+* "never" as an expiration choice is enable by default! This creates snippets
+  in the database which are never purged.
+* The API create call now supports to set the exiration time.
+* Some simple Bootstrap 3 support.
+* Gist fixes on Python 3 .
+
 2.6 (2014-04-12)
 ----------------
 
diff --git a/setup.py b/setup.py
index 8ea3433..ead1b53 100644
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ long_description = u'\n\n'.join((
 
 setup(
     name='dpaste',
-    version='2.6',
+    version='2.7',
     description='dpaste is a Django based pastebin. It\'s intended to run '
                 'separately but its also possible to be installed into an '
                 'existing Django project like a regular app.',