Andrew Godwin b62e82365a Merge remote-tracking branch 'core/master' into schema-alteration ... Conflicts: django/db/models/loading.py django/db/models/options.py		2012-12-18 09:02:07 +00:00
..
backends	Merge remote-tracking branch 'core/master' into schema-alteration	2012-12-18 09:02:07 +00:00
models	Merge remote-tracking branch 'core/master' into schema-alteration	2012-12-18 09:02:07 +00:00
__init__.py	Fixed #18575 -- Empty DATABASES should default to dummy backend	2012-10-28 23:44:03 +01:00
transaction.py	Removed with_statement imports, useless in Python >= 2.6. Refs #17965. Thanks jonash for the patch.	2012-03-30 08:02:08 +00:00
utils.py	Fixed #19357 -- Allow non-ASCII chars in filesystem paths	2012-12-08 11:13:52 +01:00