From daf927ef68ce992055e8b7bc1a07cf03ee67b742 Mon Sep 17 00:00:00 2001
From: Colin
Date: Thu, 17 Oct 2013 12:28:58 -0700
Subject: add @tamakisquare for work on #1111

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

(limited to 'docs/topics/credits.md')

diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index 9a20028c..e9c45965 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -172,6 +172,7 @@ The following people have helped make REST framework great.
 * Markus Kaiserswerth - [mkai]
 * Henry Clifford - [hcliff]
 * Thomas Badaud - [badale]
+* Colin Huang - [tamakisquare]
 
 Many thanks to everyone who's contributed to the project.
 
@@ -380,3 +381,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
 [mkai]: https://github.com/mkai
 [hcliff]: https://github.com/hcliff
 [badale]: https://github.com/badale
+[tamakisquare]: https://github.com/tamakisquare
-- 
cgit v1.2.3


From fa87fac61b87858e80788fc233591fa11dbc18e7 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 22 Oct 2013 10:21:06 +0100
Subject: Added @ross for work on #1187. Thanks!

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

(limited to 'docs/topics/credits.md')

diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index e9c45965..cd3b3710 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -173,6 +173,7 @@ The following people have helped make REST framework great.
 * Henry Clifford - [hcliff]
 * Thomas Badaud - [badale]
 * Colin Huang - [tamakisquare]
+* Ross McFarland - [ross]
 
 Many thanks to everyone who's contributed to the project.
 
@@ -382,3 +383,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
 [hcliff]: https://github.com/hcliff
 [badale]: https://github.com/badale
 [tamakisquare]: https://github.com/tamakisquare
+[ross]: https://github.com/ross
-- 
cgit v1.2.3