From 5efc814fe02895a064aeb5f7a05735685f4c6a4c Mon Sep 17 00:00:00 2001
From: Michael Ziegler <diese-addy@funzt-halt.net>
Date: Mon, 21 Jun 2010 08:11:40 +0200
Subject: [PATCH] Releasing v2.2.

---
 CHANGELOG | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index ee2133b..b3bc829 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,18 @@
 Mumble-Django changelog
 =======================
 
+Version 2.2, 21 June 2010:
+------------------------------
+* Add version info and display, and an update check.
+* Add IPv6 support.
+* Add usersperchannel configuration field.
+* Add views for the Channel Viewer Protocol.
+* Fix an encoding issue in the channel name truncator.
+* Add basic theming support.
+* Add munindoc documentation to the Munin plugin.
+* Include CSRF protection mechanisms to fix errors with Django >= 1.2.1.
+* Reorganized settings.py to make clear which settings are interesting.
+
 Version 2.1, 27 Apr 2010:
 ------------------------------
 * Fixed a few encoding issues in the Munin plugin and the DBus Ctls.