From c29b08ad43c8de5f295176eaf0270427f3a737f3 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 19 Dec 2012 22:06:38 +0000
Subject: Update release notes

---
 docs/topics/release-notes.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs')

diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 87aaefbd..c75f0879 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -8,6 +8,7 @@
 
 ### Master
 
+* Bugfix: Fix exception in browseable API on DELETE.
 * Bugfix: Fix issue where pk was was being set to a string if set by URL kwarg.
 
 ### 2.1.11
-- 
cgit v1.2.3


From 566b9ff27b93dfa089d054552a94d930e3f17c67 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 19 Dec 2012 22:41:00 +0000
Subject: Added @joual - Thanks!

---
 docs/topics/credits.md | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'docs')

diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index c169fd74..fa378cb2 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -79,6 +79,7 @@ The following people have helped make REST framework great.
 * Colin Murtaugh - [cmurtaugh]
 * Simon Pantzare - [pilt]
 * Szymon Teżewski - [sunscrapers]
+* Joel Marcotte - [joual]
 
 Many thanks to everyone who's contributed to the project.
 
@@ -193,3 +194,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
 [cmurtaugh]: https://github.com/cmurtaugh
 [pilt]: https://github.com/pilt
 [sunscrapers]: https://github.com/sunscrapers
+[joual]: https://github.com/joual
-- 
cgit v1.2.3


From c097bcef586da4513d1d6f357d9eb3d7b4b0fffb Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 19 Dec 2012 22:42:11 +0000
Subject: Update release notes.

---
 docs/topics/release-notes.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs')

diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index c75f0879..741d908c 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -8,6 +8,7 @@
 
 ### Master
 
+* Bugfix: Fix bug that could occur using ChoiceField.
 * Bugfix: Fix exception in browseable API on DELETE.
 * Bugfix: Fix issue where pk was was being set to a string if set by URL kwarg.
 
-- 
cgit v1.2.3