# HG changeset patch
# User Goffi <goffi@goffi.org>
# Date 1449512104 -3600
# Node ID 642dffb9d6f1e7b2e7d5e9cb6ba17b6950fdf0bb
# Parent  bf4098a6cbb7ad32a895b974b0d7d4f2ced458a1
fixed version change and CHANGELOG update

diff -r bf4098a6cbb7 -r 642dffb9d6f1 CHANGELOG
--- a/CHANGELOG	Thu Nov 26 14:59:24 2015 +0100
+++ b/CHANGELOG	Mon Dec 07 19:15:04 2015 +0100
@@ -1,3 +1,16 @@
+v. 0.2 (02/12/2015):
+	- schema updated (unversioned => version 1)
+	- sync with Idavoll
+	- use of sat.tmp.wokkel as a workaround for change not merged upstream
+	- RSM (XEP-0059) implementation
+	- MAM (XEP-0313) implementation
+	- Namespace Delegation (XEP-0355) implementation
+	- Privileged Entity (XEP-0356) implementation
+	- removed remote-roster hack
+	- SàT PubSub can be used as a PEP service (PEP implementation not complete yet)
+	- item publisher is enforced
+	- categories handling (not complete)
+
 v 0.1.1 (09/09/2014):
     bugfix release
 
diff -r bf4098a6cbb7 -r 642dffb9d6f1 README
--- a/README	Thu Nov 26 14:59:24 2015 +0100
+++ b/README	Mon Dec 07 19:15:04 2015 +0100
@@ -1,7 +1,7 @@
 SàT PubSub component v0.1.1
 This program is heavily based on Idavoll (0.9.1), which was written by Ralph Meijer
 
-Copyright (c) 2014 Adrien Cossa
+Copyright (c) 2014, 2015 Adrien Cossa
 Copyright (c) 2012, 2013, 2014, 2015 Jérôme Poisson
 Copyright (c) 2003-2011 Ralph Meijer
 
diff -r bf4098a6cbb7 -r 642dffb9d6f1 sat_pubsub/__init__.py
--- a/sat_pubsub/__init__.py	Thu Nov 26 14:59:24 2015 +0100
+++ b/sat_pubsub/__init__.py	Mon Dec 07 19:15:04 2015 +0100
@@ -56,7 +56,7 @@
 Idavoll, a generic XMPP publish-subscribe service.
 """
 
-__version__ = '0.1.0D'
+__version__ = '0.2.0'
 
 # TODO: remove this when RSM and MAM are in wokkel
 import wokkel