Merge branch 'master' of github.com:benjaoming/django-wiki
Add settings for inheriting owner and group permissions and fix #99
Merge branch 'master' of github.com:benjaoming/django-wiki