Merge branch 'master' into schema-alteration

Conflicts:
	django/db/backends/__init__.py
	django/db/backends/mysql/base.py
	django/db/backends/oracle/base.py
	django/db/backends/oracle/creation.py
	django/db/backends/postgresql_psycopg2/base.py
	django/db/backends/sqlite3/base.py
	django/db/models/fields/related.py

1 files changed, 8 insertions, 0 deletions

diff --git a/tests/admin_scripts/complex_app/admin/foo.py b/tests/admin_scripts/complex_app/admin/foo.py
new file mode 100644
index 0000000000..1ed704a66b
--- /dev/null
+++ b/tests/admin_scripts/complex_app/admin/foo.py
@@ -0,0 +1,8 @@
+from __future__ import absolute_import
+
+from django.contrib import admin
+
+from ..models.foo import Foo
+
+
+admin.site.register(Foo)