Fixed #2347 -- documented the use of "and" in the blocktrans template tag.
Fixed #2347 -- documented the use of "and" in the blocktrans template tag.


git-svn-id: 554f83ef17aa7291f84efa897c1acfc5d0035373@3345 bcc190cf-cafb-0310-a4f2-bffc1f526a37

svn2github/django,svn2github/django,svn2github/django