[django/django] 14366e: [1.6.x] Fixed #22013 -- Documented difference betw...

[GitHub]

Branch: refs/heads/stable/1.6.x
Home: https://github.com/django/django
Commit: 14366ed33e4473c8c2f321f224dd62221adc7629
https://github.com/django/django/commit/14366ed33e4473c8c2f321f224dd62221adc7629
Author: Zbigniew Siciarz <anty...@gmail.com>
Date: 2014-02-15 (Sat, 15 Feb 2014)

Changed paths:
M docs/ref/settings.txt

Log Message:
-----------
[1.6.x] Fixed #22013 -- Documented difference between SERVER_EMAIL and DEFAULT_FROM_EMAIL.

Backport of 44814e78cc from master