..
Merge branch 'master' of github.com:simion/django-templated-email