Anssi Kääriäinen 049eebc070 Merge branch 'master' into lookups_3 ...

Conflicts:
	django/db/models/fields/__init__.py
	django/db/models/sql/compiler.py
	django/db/models/sql/query.py
	tests/null_queries/tests.py

2013-12-21 22:53:10 +02:00

..

__init__.py

Merged regressiontests and modeltests into the test root.

2013-02-26 14:36:57 +01:00

models.py

Fixed #21376 -- New implementation for query join promotion logic

2013-11-07 12:53:26 +02:00

tests.py

Merge branch 'master' into lookups_3

2013-12-21 22:53:10 +02:00