From 983d8d1dc86d5cf79d3ee834aca0ec98d2d8f0ca Mon Sep 17 00:00:00 2001
From: Martin Mahner <martin@mahner.org>
Date: Wed, 18 Dec 2013 11:41:39 +0100
Subject: [PATCH] Bumped up to version 2.2. Updated changelog.

---
 CHANGELOG | 7 ++++---
 setup.py  | 9 +++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 7a43687..b6d5c48 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,9 +1,10 @@
-dpaste Changelog
-================
+Changelog
+=========
 
-2.2 (WIP)
+2.2 (2013-12-18)
 ----------------
 
+* Added documentation: http://dpaste.readthedocs.org/en/latest/
 * Added support for CSRF middleware
 * Windows users can submit the form using Ctrl+Enter
 * The raw view now sends the X-Content-Type-Options=nosniff header
diff --git a/setup.py b/setup.py
index 63f99a5..b4649a3 100644
--- a/setup.py
+++ b/setup.py
@@ -15,13 +15,18 @@ class Tox(TestCommand):
         errno = tox.cmdline(self.test_args)
         exit(errno)
 
+long_description = u'\n\n'.join((
+    open('README.rst').read(),
+    open('CHANGELOG').read()
+))
+
 setup(
     name='dpaste',
-    version='2.1',
+    version='2.2',
     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.',
-    long_description=open('README.rst').read(),
+    long_description=long_description,
     author='Martin Mahner',
     author_email='martin@mahner.org',
     url='https://github.com/bartTC/dpaste/',