fix bug
Merge branch 'master' of git://github.com/ridethepony/django-fiber into upstream