Fix #136
Merge branch 'master' of github.com:benjaoming/django-wiki