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
..
2006-05-26 05:37:21 +00:00
2013-04-18 17:16:39 +01:00
2009-04-11 11:41:35 +00:00
2013-02-16 09:19:04 +01:00
2013-04-18 17:16:39 +01:00
2013-03-02 10:29:03 +01:00
2012-09-07 15:56:07 -04:00