topics/db/multi-db
Merge branch 'master' of github.com:Alerion/django_documentation
Merge branch 'master' of github.com:Alerion/django_documentation
topics/cache commit state
Merge branch 'master' of github.com:Alerion/django_documentation
Merge branch 'master' of github.com:Alerion/django_documentation
Merge pull request #19 from TyVik/master

Перевод "Troubleshooting"
fix index
Merge branch 'master' of https://github.com/Alerion/django_documentation

Conflicts:
	locale/ru/LC_MESSAGES/index.po
add base of authors page
Merge branch 'master' of github.com:Alerion/django_documentation
update contributors page
Merge branch 'master' of github.com:Alerion/django_documentation
wsgi/index.po - 100%
wsgi/modwsgi.po - 97%
update documentation
update documentation
update documentation
topics/python3 - 100%
Merge pull request #23 from TyVik/csv

Перевод "Outputting CSV with Django"