Merge branch 'master' into configuration_variables

Conflicts:
	CHANGES.rst

Author: LuanP

CHANGES.rst

@@ -2,13 +2,22 @@ Changelog
 =========
 
 
-0.2.9 (2013-12-06)
+0.3.0 (2013-12-06)
 ------------
 
 - Adding CONVERSEJS_ALLOW_CONTACT_REQUESTS configuration variable. [LuanP]
 - Adding CONVERSEJS_SHOW_ONLY_ONLINE_USERS configuration variable. [LuanP]
 
 
+0.2.9 (2013-11-26)
+------------
+
+- Adding timeout to BOSH connections [seocam]
+- Adding function to change user password [LuanP]
+- Moving/refactor registration functions to xmpp.py [LuanP]
+- Better error handling on xmpp connections [LuanP]
+
+
 0.2.8 (2013-10-20)
 ------------
 

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.9',
+    version='0.3.0',
     long_description=read('README.rst'),
     packages=['conversejs',
               'conversejs.migrations',