From f05e7927cd71d0dedd32ba65a3055beb5927acd4 Mon Sep 17 00:00:00 2001
From: Sergio Oliveira <sergio@tracy.com.br>
Date: Thu, 19 Sep 2013 13:54:50 -0300
Subject: [PATCH] Bumping version

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

diff --git a/CHANGES.rst b/CHANGES.rst
index 1c2a2cb..78732b8 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,10 +2,12 @@ Changelog
 =========
 
 
-Not released
+0.2.6 (2013-09-19)
 ------------
 
 - Added converse.js fonticons to static files [seocam]
+- Converse.js updated. Version 0.6.4 still used but with a patch applied to CSS to avoid clashing with Bootstrap. [seocam]
+- Updating setup to use pure-sasl from PyPI [seocam]
 
 
 0.2.5 (2013-09-16)
diff --git a/setup.py b/setup.py
index 64d4b04..0d7da48 100644
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@ def read(*parts):
 setup(
     name='django-conversejs',
     description='Adds converse.js (javascript XMPP client) to Django',
-    version='0.2.5',
+    version='0.2.6',
     long_description=read('README.rst'),
     packages=['conversejs',
               'conversejs.migrations',