From e094ae724a10fc911f7dc9c86c851e4639e2f1ea Mon Sep 17 00:00:00 2001
From: Joshua Roesslein <jroesslein@gmail.com>
Date: Sun, 16 Jun 2013 12:13:07 -0700
Subject: [PATCH] Release 2.1.

---
 CHANGELOG.md       | 15 +++++++++++++++
 tweepy/__init__.py |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae55c74..b9c3151 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,18 @@
+Version 2.1
+-----------
+  - Added get_oembed().
+  - friends() and followers() are back and updated to v1.1.
+  - Fixed report_spam() endpoint.
+  - Added "languages" parameter to streaming filter() method.
+  - Added "timeout" support for API object. Ex: API(timeout=1000).
+  - Python 2.5 no longer supported.
+  - Added compression support. Ex: API(compression=True).
+  - Added on_connect() callback to StreamListener.
+  - Switched API search() to v1.1 endpoint. Some breaking changes.
+  - Drop "page" based cursors and use "ID" based ones instead.
+  - [Compare
+    2.0...master](https://github.com/tweepy/tweepy/compare/2.0...master)
+
 Version 2.0
 -----------
   _Dedicated in memory of Aaron Swartz_
diff --git a/tweepy/__init__.py b/tweepy/__init__.py
index 24529e7..4a45b54 100644
--- a/tweepy/__init__.py
+++ b/tweepy/__init__.py
@@ -5,7 +5,7 @@
 """
 Tweepy Twitter API library
 """
-__version__ = '2.0'
+__version__ = '2.1'
 __author__ = 'Joshua Roesslein'
 __license__ = 'MIT'
 
-- 
2.25.1