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

..

backends

Merge branch 'master' into schema-alteration

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

models

Merge branch 'master' into schema-alteration

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

__init__.py

Added some assertions to enforce the atomicity of atomic.

2013-03-11 14:48:55 +01:00

transaction.py

Fix typo in transaction.Atomic docstring

2013-04-03 16:49:48 +03:00

utils.py

Deprecated TransactionMiddleware and TRANSACTIONS_MANAGED.

2013-03-11 15:04:05 +01:00