Automated merge with ssh://hg@bitbucket.org/Tim/django-lean/
Automated merge with ssh://hg@bitbucket.org/Tim/django-lean/

uhuramedia/django-lean,MontmereLimited/django-lean,uhuramedia/django-lean,MontmereLimited/django-lean,MontmereLimited/django-lean,uhuramedia/django-lean