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, 0 insertions, 62 deletions

diff --git a/examples/epio.ini b/examples/epio.ini
deleted file mode 100644
index 4e61a42d..00000000
--- a/examples/epio.ini
+++ /dev/null
@@ -1,62 +0,0 @@
-# This is an example epio.ini file.
-# We suggest you edit it to fit your application's needs.
-# Documentation for the options is available at www.ep.io/docs/epioini/
-
-[wsgi]
-
-# Location of your requirements file
-requirements = requirements-epio.txt
-
-
-[static]
-
-# Serve the static directory directly as /static
-/static/admin = ../shortcuts/django-admin-media/
-
-
-[services]
-
-# Uncomment to enable the PostgreSQL service.
-postgres = true
-
-# Uncomment to enable the Redis service
-# redis = true
-
-
-[checkout]
-
-# By default your code is put in a directory called 'app'.
-# You can change that here.
-# directory_name = my_project
-
-
-[env]
-
-# Set any additional environment variables here. For example:
-# IN_PRODUCTION = true
-
-
-[symlinks]
-
-# Any symlinks you'd like to add. As an example, link the symlink 'config.py'
-# to the real file 'configs/epio.py':
-# config.py = configs/epio.py
-
-media/ = %(data_directory)s/
-
-# #### If you're using Django, you'll want to uncomment some or all of these lines ####
-# [django]
-# # Path to your project root, relative to this directory.
-# base = .
-#
-# [static]
-# Serve the admin media
-# # Django 1.3
-# /static/admin = ../shortcuts/django-admin-media/
-# # Django 1.2 and below
-# /media = ../shortcuts/django-admin-media/
-#
-# [env]
-# # Use a different settings module for ep.io (i.e. with DEBUG=False)
-# DJANGO_SETTINGS_MODULE = production_settings
-