{% load url from future %} is no longer necessary in django 1.5
Merge branch 'master' into django1.5
update version to reflect Django1.5 compatibility