Django 1.4/1.5  urls
Merge Django 1.4 upgrade