From 3f891d9a410b9b6bd7c7c6d1285d8f23b8c3721d Mon Sep 17 00:00:00 2001
From: Johannes Raggam <raggam-nl@adm.at>
Date: Mon, 19 Mar 2012 13:38:06 +0100
Subject: [PATCH] changelog entries for last two commits. prepare release

---
 docs/changelog.rst | 13 +++++++++++++
 setup.py           |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 225f833..9ef23f0 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -2,6 +2,19 @@ Changelog
 =========
 
 
+3.1 (unreleased)
+----------------
+
+* Add 'recursive' argument to property_items() to switch recursive listing.
+  For example when parsing a text/calendar text including multiple components
+  (e.g. a VCALENDAR with 5 VEVENTs), the previous situation required us to look
+  over all properties in VEVENTs even if we just want the properties under the
+  VCALENDAR component (VERSION, PRODID, CALSCALE, METHOD).
+  [dmikurube]
+
+* All unit tests fixed.
+  [mikaelfrykholm]
+
 3.0.1b2 (2012-03-01)
 --------------------
 
diff --git a/setup.py b/setup.py
index 0d5da0d..54f180a 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 import os
 import setuptools
 
-version = '3.0.1b2'
+version = '3.1'
 
 setuptools.setup(
     name='icalendar',