From 5734b6e20241c4d0d1441535657c5ef25302b225 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Mon, 29 Sep 2014 16:56:50 +0100
Subject: Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'README.md')

diff --git a/README.md b/README.md
index 63513f75..428fb8e9 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ There is a live example API for testing purposes, [available here][sandbox].
 
 # Requirements
 
-* Python (2.6.5+, 2.7, 3.2, 3.3)
+* Python (2.6.5+, 2.7, 3.2, 3.3, 3.4)
 * Django (1.4.2+, 1.5, 1.6, 1.7)
 
 # Installation
-- 
cgit v1.2.3


From 702f47700de2c10f26f06b23099740c408ffe797 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Fri, 24 Oct 2014 12:12:01 +0100
Subject: Updated requirements

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'README.md')

diff --git a/README.md b/README.md
index 63513f75..e71fe7bf 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ There is a live example API for testing purposes, [available here][sandbox].
 # Requirements
 
 * Python (2.6.5+, 2.7, 3.2, 3.3)
-* Django (1.4.2+, 1.5, 1.6, 1.7)
+* Django (1.4.11+, 1.5.5+, 1.6, 1.7)
 
 # Installation
 
-- 
cgit v1.2.3


From 0da30e6d1dea68d7c075067dd997fb1e0e26f27b Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Mon, 3 Nov 2014 14:43:00 +0000
Subject: Add note about 3.0 being merged to master

---
 README.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'README.md')

diff --git a/README.md b/README.md
index ec13e1b3..394d7fcf 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,13 @@
 
 **Awesome web-browseable Web APIs.**
 
-**Note**: Full documentation for the project is available at [http://www.django-rest-framework.org][docs].
+Full documentation for the project is available at [http://www.django-rest-framework.org][docs].
+
+---
+
+**Note**: The incoming 3.0 version has now been merged to the `master` branch on GitHub. For the source of the currently available PyPI version, please see the `2.4.4` tag.
+
+---
 
 # Overview
 
-- 
cgit v1.2.3


From 03310cc33ae800a36f17a421c8114e0e6616ccb6 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Thu, 13 Nov 2014 12:06:45 +0000
Subject: Add PyPI version badge.

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'README.md')

diff --git a/README.md b/README.md
index 394d7fcf..c86bb65f 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # Django REST framework
 
 [![build-status-image]][travis]
+[![pypi-version]][pypi]
 
 **Awesome web-browseable Web APIs.**
 
@@ -181,6 +182,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 [build-status-image]: https://secure.travis-ci.org/tomchristie/django-rest-framework.png?branch=master
 [travis]: http://travis-ci.org/tomchristie/django-rest-framework?branch=master
+[pypi-version]: https://pypip.in/version/djangorestframework/badge.svg
+[pypi]: https://pypi.python.org/pypi/djangorestframework
 [twitter]: https://twitter.com/_tomchristie
 [group]: https://groups.google.com/forum/?fromgroups#!forum/django-rest-framework
 [0.4]: https://github.com/tomchristie/django-rest-framework/tree/0.4.X
-- 
cgit v1.2.3