Automated merge with https://bitbucket.org/wkornewald/django-mediagenerator
Automated merge with https://bitbucket.org/wkornewald/django-mediagenerator

linked/django-mediagenerator,adieu/django-mediagenerator,Carlangueitor/django-mediagenerator,adieu/django-mediagenerator,Carlangueitor/django-mediagenerator,linked/django-mediagenerator,linked/django-mediagenerator