switch to new url tag syntax
Merge branch 'master' into django-1.5
putting extends on top of template
Merge commit '23c1dd2d7ee47415714cd7654561522a459fb329' into django-1.5
Merge pull request #56 from dimagi/django-1.5

Django 1.5