[django/django] 949076: Fixed #21263 -- Fixed issue with override_settings...

[GitHub]

Branch: refs/heads/master
Home: https://github.com/django/django
Commit: 949076eb11011736f9e827adfde03c842bc1f1dd
https://github.com/django/django/commit/949076eb11011736f9e827adfde03c842bc1f1dd
Author: Claude Paroz <cla...@2xlibre.net>
Date: 2013-10-15 (Tue, 15 Oct 2013)

Changed paths:
M django/test/testcases.py
M django/test/utils.py
M tests/settings_tests/tests.py

Log Message:
-----------
Fixed #21263 -- Fixed issue with override_settings in inherited classes

When both parent and child classes are decorated with override_settings,
child class settings should take precedence.
Thanks Sephi for the report and Marc Tamlyn for the review.