From 590645fcd62508f428db2899d5772299a20d7579 Mon Sep 17 00:00:00 2001
From: Martin Mahner <martin@mahner.org>
Date: Tue, 21 Jan 2014 21:13:37 +0100
Subject: [PATCH] 2.5 Release.

---
 CHANGELOG | 4 +++-
 setup.py  | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 59a1481..71900b4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,12 +1,14 @@
 Changelog
 =========
 
-2.5 (DEV)
+2.5 (2014-01-21)
 ----------------
 
 * IRC lexer is now in the default lexer list.
 * One-time snippet support. Snippets get automatically deleted after the
   another user looks at it.
+* Toggle wordwrap for code snippets.
+* General UI and readability improvements.
 
 2.4 (2014-01-11)
 ----------------
diff --git a/setup.py b/setup.py
index 7900a27..db11d7e 100644
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ long_description = u'\n\n'.join((
 
 setup(
     name='dpaste',
-    version='2.4',
+    version='2.5',
     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.',