Merge branch 'restframework2' into rest-framework-2-merge2.0.0

Conflicts:
	.gitignore
	.travis.yml
	AUTHORS
	README.rst
	djangorestframework/mixins.py
	djangorestframework/renderers.py
	djangorestframework/resources.py
	djangorestframework/serializer.py
	djangorestframework/templates/djangorestframework/base.html
	djangorestframework/templates/djangorestframework/login.html
	djangorestframework/templatetags/add_query_param.py
	djangorestframework/tests/accept.py
	djangorestframework/tests/authentication.py
	djangorestframework/tests/content.py
	djangorestframework/tests/reverse.py
	djangorestframework/tests/serializer.py
	djangorestframework/views.py
	docs/examples.rst
	docs/examples/blogpost.rst
	docs/examples/modelviews.rst
	docs/examples/objectstore.rst
	docs/examples/permissions.rst
	docs/examples/pygments.rst
	docs/examples/views.rst
	docs/howto/alternativeframeworks.rst
	docs/howto/mixin.rst
	docs/howto/reverse.rst
	docs/howto/usingurllib2.rst
	docs/index.rst
	docs/topics/release-notes.md
	examples/sandbox/views.py
	rest_framework/__init__.py
	rest_framework/compat.py
	rest_framework/utils/breadcrumbs.py
	setup.py

1 files changed, 139 insertions, 0 deletions

diff --git a/docs/topics/credits.md b/docs/topics/credits.md
new file mode 100644
index 00000000..69d57802
--- /dev/null
+++ b/docs/topics/credits.md
@@ -0,0 +1,139 @@
+# Credits
+
+The following people have helped make REST framework great.
+
+* Tom Christie - [tomchristie] 
+* Marko Tibold - [markotibold]
+* Paul Bagwell - [pbgwl]
+* Sébastien Piquemal - [sebpiq]
+* Carmen Wick - [cwick]
+* Alex Ehlke - [aehlke]
+* Alen Mujezinovic - [flashingpumpkin]
+* Carles Barrobés - [txels]
+* Michael Fötsch - [mfoetsch]
+* David Larlet - [david]
+* Andrew Straw - [astraw]
+* Zeth - [zeth]
+* Fernando Zunino - [fzunino]
+* Jens Alm - [ulmus]
+* Craig Blaszczyk - [jakul]
+* Garcia Solero - [garciasolero]
+* Tom Drummond - [devioustree]
+* Danilo Bargen - [gwrtheyrn]
+* Andrew McCloud - [amccloud]
+* Thomas Steinacher - [thomasst]
+* Meurig Freeman - [meurig]
+* Anthony Nemitz - [anemitz]
+* Ewoud Kohl van Wijngaarden - [ekohl]
+* Michael Ding - [yandy]
+* Mjumbe Poe - [mjumbewu]
+* Natim - [natim]
+* Sebastian Żurek - [sebzur]
+* Benoit C - [dzen]
+* Chris Pickett - [bunchesofdonald]
+* Ben Timby - [btimby]
+* Michele Lazzeri - [michelelazzeri-nextage]
+* Camille Harang - [mammique]
+* Paul Oswald - [poswald]
+* Sean C. Farley - [scfarley]
+* Daniel Izquierdo - [izquierdo]
+* Can Yavuz - [tschan]
+* Shawn Lewis - [shawnlewis]
+* Alec Perkins - [alecperkins]
+* Michael Barrett - [phobologic]
+* Mathieu Dhondt - [laundromat]
+* Johan Charpentier - [cyberj]
+* Jamie Matthews - [j4mie]
+* Mattbo - [mattbo]
+* Max Hurl - [maximilianhurl]
+* Tomi Pajunen - [eofs]
+* Rob Dobson - [rdobson]
+* Daniel Vaca Araujo - [diviei]
+* Madis Väin - [madisvain]
+* Stephan Groß - [minddust]
+
+Many thanks to everyone who's contributed to the project.
+
+## Additional thanks
+
+The documentation is built with [Bootstrap] and [Markdown].
+
+Project hosting is with [GitHub].
+
+Continuous integration testing is managed with [Travis CI][travis-ci].
+
+The [live sandbox][sandbox] is hosted on [Heroku]. 
+
+Various inspiration taken from the [Piston], [Tastypie] and [Dagny] projects.
+
+Development of REST framework 2.0 was sponsored by [DabApps].
+
+## Contact
+
+To contact the author directly:
+
+* twitter: [@_tomchristie][twitter]
+* email: [tom@tomchristie.com][email]
+ 
+[email]: mailto:tom@tomchristie.com
+[twitter]: http://twitter.com/_tomchristie
+[bootstrap]: http://twitter.github.com/bootstrap/
+[markdown]: http://daringfireball.net/projects/markdown/
+[github]: github.com/tomchristie/django-rest-framework
+[travis-ci]: https://secure.travis-ci.org/tomchristie/django-rest-framework
+[piston]: https://bitbucket.org/jespern/django-piston
+[tastypie]: https://github.com/toastdriven/django-tastypie
+[dagny]: https://github.com/zacharyvoase/dagny
+[dabapps]: http://lab.dabapps.com
+[sandbox]: http://restframework.herokuapp.com/
+[heroku]: http://www.heroku.com/
+
+[tomchristie]: https://github.com/tomchristie
+[markotibold]: https://github.com/markotibold
+[pbgwl]: https://github.com/pbgwl
+[sebpiq]: https://github.com/sebpiq
+[cwick]: https://github.com/cwick
+[aehlke]: https://github.com/aehlke
+[flashingpumpkin]: https://github.com/flashingpumpkin
+[txels]: https://github.com/txels
+[mfoetsch]: https://github.com/mfoetsch
+[david]: https://github.com/david
+[astraw]: https://github.com/astraw
+[zeth]: https://github.com/zeth
+[fzunino]: https://github.com/fzunino
+[ulmus]: https://github.com/ulmus
+[jakul]: https://github.com/jakul
+[garciasolero]: https://github.com/garciasolero
+[devioustree]: https://github.com/devioustree
+[gwrtheyrn]: https://github.com/gwrtheyrn
+[amccloud]: https://github.com/amccloud
+[thomasst]: https://github.com/thomasst
+[meurig]: https://github.com/meurig
+[anemitz]: https://github.com/anemitz
+[ekohl]: https://github.com/ekohl
+[yandy]: https://github.com/yandy
+[mjumbewu]: https://github.com/mjumbewu
+[natim]: https://github.com/natim
+[sebzur]: https://github.com/sebzur
+[dzen]: https://github.com/dzen
+[bunchesofdonald]: https://github.com/bunchesofdonald
+[btimby]: https://github.com/btimby
+[michelelazzeri-nextage]: https://github.com/michelelazzeri-nextage
+[mammique]: https://github.com/mammique
+[poswald]: https://github.com/poswald
+[scfarley]: https://github.com/scfarley
+[izquierdo]: https://github.com/izquierdo
+[tschan]: https://github.com/tschan
+[shawnlewis]: https://github.com/shawnlewis
+[alecperkins]: https://github.com/alecperkins
+[phobologic]: https://github.com/phobologic
+[laundromat]: https://github.com/laundromat
+[cyberj]: https://github.com/cyberj
+[j4mie]: https://github.com/j4mie
+[mattbo]: https://github.com/mattbo
+[maximilianhurl]: https://github.com/maximilianhurl
+[eofs]: https://github.com/eofs
+[rdobson]: https://github.com/rdobson
+[diviei]: https://github.com/diviei
+[madisvain]: https://github.com/madisvain
+[minddust]: https://github.com/minddust
\ No newline at end of file