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

diff --git a/tests/basic/models.py b/tests/basic/models.py
new file mode 100644
index 0000000000..660beddf49
--- /dev/null
+++ b/tests/basic/models.py
@@ -0,0 +1,20 @@
+# coding: utf-8
+"""
+1. Bare-bones model
+
+This is a basic model with only two non-primary-key fields.
+"""
+from django.db import models
+from django.utils.encoding import python_2_unicode_compatible
+
+
+@python_2_unicode_compatible
+class Article(models.Model):
+    headline = models.CharField(max_length=100, default='Default headline')
+    pub_date = models.DateTimeField()
+
+    class Meta:
+        ordering = ('pub_date','headline')
+
+    def __str__(self):
+        return self.headline