topics/db/multi-db
Merge branch 'master' of github.com:Alerion/django_documentation
Merge branch 'master' of github.com:Alerion/django_documentation
CBV index done
CBV index fixes
CBV index fixes + CBV Forms
base + fixes
mixins-single-object.po
obsolete/index.po
/ref/class-based-views/base.po
/ref/class-based-views/flattened-index.po
locale/ru/LC_MESSAGES/ref/class-based-views/mixins.po
/ref/urlresolvers.po - 91%
/ref/urlresolvers.po - 94%
/topics/files.po - 100%
class-based-views/generic-display.po finished
fixes
Merge branch 'master' of git://github.com/redVi/django_documentation into redVi-master

Conflicts:
	locale/ru/LC_MESSAGES/ref/urlresolvers.po
Merge branch 'master' of git://github.com/compfaculty/django_documentation into compfaculty-master
Merge pull request #14 from redVi/files

/topics/files.po - 100%