From e7b5e0c98148b76b629de8edefaff9c8c2a540a7 Mon Sep 17 00:00:00 2001
From: Michael Ziegler <diese-addy@funzt-halt.net>
Date: Sun, 9 Oct 2011 20:28:55 +0200
Subject: [PATCH] Releasing v2.5.

---
 CHANGELOG | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index d16c7a4..b6183bf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,7 +2,7 @@
 Mumble-Django changelog
 =======================
 
-Version 2.5, 05 Sep 2011:
+Version 2.5, 09 Okt 2011:
 ------------------------------
 * Add start,stop,restart,{en,dis}able_autoboot admin actions
 * Add admin action to set the users avatar to their gravatar
@@ -19,6 +19,8 @@ Version 2.5, 05 Sep 2011:
 * Add a setting to hide offline servers from the servers list.
 * Add support for suggest{version,positional,pushtotalk} server settings.
 * Validate the jsonp callback name to prevent xss attacks.
+* Change the server instance detection to run whenever a MumbleServer is saved.
+* Correctly focus the username field in the login window.
 
 Version 2.4, 14 Nov 2010:
 ------------------------------