pull #139 - form data from args or kwargs
Merge branch 'master' of github.com:benjaoming/django-wiki
pull #139 - form data from args or kwargs