django 1.5 cmplatibility issue
Merge pull request #1 from pat1/master

django 1.5 compatibility issue