A simple django project
Merge branch 'master' of github.com:ramartinez/mwiki