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

6 files changed, 30 insertions, 0 deletions

diff --git a/tests/admin_scripts/complex_app/__init__.py b/tests/admin_scripts/complex_app/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/admin_scripts/complex_app/__init__.py
diff --git a/tests/admin_scripts/complex_app/admin/__init__.py b/tests/admin_scripts/complex_app/admin/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/admin_scripts/complex_app/admin/__init__.py
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)
diff --git a/tests/admin_scripts/complex_app/models/__init__.py b/tests/admin_scripts/complex_app/models/__init__.py
new file mode 100644
index 0000000000..7b647e74b1
--- /dev/null
+++ b/tests/admin_scripts/complex_app/models/__init__.py
@@ -0,0 +1,4 @@
+from .bar import Bar
+from .foo import Foo
+
+__all__ = ['Foo', 'Bar']
diff --git a/tests/admin_scripts/complex_app/models/bar.py b/tests/admin_scripts/complex_app/models/bar.py
new file mode 100644
index 0000000000..15956f7a50
--- /dev/null
+++ b/tests/admin_scripts/complex_app/models/bar.py
@@ -0,0 +1,11 @@
+from __future__ import absolute_import
+
+from django.db import models
+
+from ..admin import foo
+
+
+class Bar(models.Model):
+    name = models.CharField(max_length=5)
+    class Meta:
+        app_label = 'complex_app'
diff --git a/tests/admin_scripts/complex_app/models/foo.py b/tests/admin_scripts/complex_app/models/foo.py
new file mode 100644
index 0000000000..914cf3b8b5
--- /dev/null
+++ b/tests/admin_scripts/complex_app/models/foo.py
@@ -0,0 +1,7 @@
+from django.db import models
+
+
+class Foo(models.Model):
+    name = models.CharField(max_length=5)
+    class Meta:
+        app_label = 'complex_app'