doble Herencia en Django templates
Merge branch 'master' of github.com:MaoAiz/django-templates