Andrew Godwin 7f3678dc4c 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

2013-04-18 17:16:39 +01:00

0 lines

Python

Raw Blame History