mirror of
				https://github.com/django/django.git
				synced 2025-10-30 17:16:10 +00:00 
			
		
		
		
	Backpatch of 9918c11114 from master.
Conflicts:
	django/db/models/sql/compiler.py
	tests/model_inheritance_regress/tests.py
		
	
Backpatch of 9918c11114 from master.
Conflicts:
	django/db/models/sql/compiler.py
	tests/model_inheritance_regress/tests.py