Add truncatechars_html filter.
truncatechars_html now working
Merge branch 'master' of github.com:martmatwarne/django

Conflicts:
	docs/releases/1.6.txt