Fixed: "wiki_footer_prepend block"
Merge pull request #165 from BenMarchant/patch-1

Fixed: "wiki_footer_prepend block"
Visitor cannot use admin as a slug (just in case !)
Merge pull request #166 from BenMarchant/patch-2

Visitor cannot use admin as a slug (just in case !)
Cleanup 'admin' slug error message
fixed non-found absolute wiki urls
Merge remote-tracking branch 'upstream/master'

Update
Merge pull request #168 from TomLottermann/master

Fixed non-found absolute wiki links
Update README.md

Minor changes to English, typo corrections.
Merge pull request #172 from holdenweb/patch-1

Update README.md
Fix Django 1.4 incompatibility
Merge branches 'master' and 'haystack' of github.com:benjaoming/django-wiki into haystack
Automatically generate README.rst for PyPi
cleanup unnecessary file
make SEARCH_VIEW configurable from conf.settings
Refactore testproject.settings to accommodate more scenarios
script to migrate south migrations to a custom auth user model (has already been run on wiki.migrations)
Add Haystack search plugin (NB! Whoosh backend is broken upstream)
cleanup