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
This commit is contained in:
Andrew Godwin 2013-04-18 17:16:39 +01:00
commit 7f3678dc4c
4298 changed files with 130294 additions and 339961 deletions

0
tests/schema/__init__.py Normal file
View file