From b3e6f2251806030820b72d5e2503ee1ade2c18d9 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Wed, 27 Aug 2014 14:06:55 +0200
Subject: [PATCH] Version 0.2.5

---
 CHANGELOG.rst          | 12 ++++++++++++
 vdirsyncer/__init__.py |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 5efa855..d55284d 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,18 @@ Changelog
 This changelog only contains information that might be useful to end users and
 package maintainers. For further info, see the git commit log.
 
+Version 0.2.5
+=============
+
+*released on 27 August 2014*
+
+- Don't ask for the password of one server more than once and fix multiple
+  concurrency issues, see issue `#101`_.
+
+- Better validation of DAV endpoints.
+
+.. _`#101`: https://github.com/untitaker/vdirsyncer/issues/101
+
 Version 0.2.4
 =============
 
diff --git a/vdirsyncer/__init__.py b/vdirsyncer/__init__.py
index 0638d10..13acb6f 100644
--- a/vdirsyncer/__init__.py
+++ b/vdirsyncer/__init__.py
@@ -9,4 +9,4 @@
     :copyright: (c) 2014 Markus Unterwaditzer & contributors
     :license: MIT, see LICENSE for more details.
 '''
-__version__ = '0.2.4'
+__version__ = '0.2.5'