Fix bug #772950
Merge pull request #957 from iakshay/master

Fix bug #772950 - Don't show "approved" information on history pages
fix bug 764006 - Remove summary and keywords from revision diff
Merge pull request #961 from darkwing/kuma-diff-764006

fix bug 764006 - Remove summary and keywords from revision diff
First draft of Django 1.5 logging configuration.

Django 1.5 compatibility: model field definitions and arguments.

Django 1.5 compatibility: Small typo in log settings.

Django 1.5 compatibility: Stop importing log_settings since we don't use it anymore.

Django 1.5 compatibility: Fix JSON field.

Django compatibility: More model field definitions that got left out of last commit.

Django compatibility: The big one.

Django compatibility: more sumo cleanup.
Django compatibility: Fixes to account for caching and misc tweaks
more django compatibility fixes

update vendor submodule to django 1.4.5 commit

restore CSRF in templates
Changes from local testing.

Behavior of _ has changed.

Add STATIC_URL setting.

This will need to be coordinated with an Apache config change to serve
admin assets from /static/admin/.
fix rebase issue
Merge pull request #962 from groovecoder/django-1.4.5-rebase

Django 1.4.5 rebase
fix bug 855714 - Restore previous editor scrolling behavior
Update html5.js

from: v1.6.2 MIT
  to: v3.6.2 MIT/GPL2
Update html5.js
fix profile edit with csrf element
Merge pull request #966 from groovecoder/edit-profile-csrf

fix profile edit with csrf element
fix move document with csrf token
Merge pull request #967 from groovecoder/move-doc-csrf

fix move document with csrf token
fix bug 854392 - Move fonts css file
Enable USE_X_FORWARDED_HOST by default
Merge pull request #969 from lmorchard/use-x-forwarded-host

Enable USE_X_FORWARDED_HOST by default