django/django — pull request #3138 by claudep (2014-08-29 12:55:32+00:00)
Title: Fixed #23384 -- Allowed overriding part of a dictionary-type setting

This change is needed for upcoming changes where settings might be
grouped in a parent dictionary.