rollback
Merge commit '45796af2d6f17218a32a2eedb0d68266a6dc494f'
Merge branch 'master' of https://github.com/ntucker/django-haystack