From 7ba2f44a0f0e5ed7bac0fbdbb0112bbfe43f6d24 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Thu, 27 Jun 2013 13:00:05 +0100
Subject: Version 2.3.6

---
 docs/topics/release-notes.md | 6 ++++--
 rest_framework/__init__.py   | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 4fecbf1f..d379ab74 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -40,13 +40,15 @@ You can determine your currently installed version using `pip freeze`:
 
 ## 2.3.x series
 
-### Master
+### 2.3.6
+
+**Date**: 27th June 2013
 
 * Added `trailing_slash` option to routers.
 * Include support for `HttpStreamingResponse`.
 * Support wider range of default serializer validation when used with custom model fields.
 * UTF-8 Support for browsable API descriptions.  
-* OAuth2 provider usez timezone aware datetimes when supported.
+* OAuth2 provider uses timezone aware datetimes when supported.
 * Bugfix: Return error correctly when OAuth non-existent consumer occurs. 
 * Bugfix: Allow `FileUploadParser` to correctly filename if provided as URL kwarg.
 * Bugfix: Fix `ScopedRateThrottle`.
diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py
index 0a210186..776618ac 100644
--- a/rest_framework/__init__.py
+++ b/rest_framework/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '2.3.5'
+__version__ = '2.3.6'
 
 VERSION = __version__  # synonym
 
-- 
cgit v1.2.3