Edited docs/email.txt changes from [5141] and other recent changesets
Edited docs/email.txt changes from [5141] and other recent changesets

--HG--
extra : convert_revision : svn%3Abcc190cf-cafb-0310-a4f2-bffc1f526a37/django/trunk%405155

Belgabor/django,Belgabor/django,Belgabor/django