[Python-modules-commits] [python-django] 02/03: Merge tag 'upstream/1.7.7' into debian/sid

[Raphaël Hertzog]

This is an automated email from the git hooks/post-receive script.

hertzog pushed a commit to branch debian/sid
in repository python-django.

commit 85a569a1de080c52a6a1d25978ebccb67f6cc15b
Merge: 6ce53e8 7a41006
Author: Raphaël Hertzog <hertzog at debian.org>
Date:   Mon Mar 23 20:39:57 2015 +0100

    Merge tag 'upstream/1.7.7' into debian/sid
    
    Upstream version 1.7.7

 AUTHORS                                           |  1 +
 Django.egg-info/PKG-INFO                          |  2 +-
 Django.egg-info/SOURCES.txt                       |  3 +
 PKG-INFO                                          |  2 +-
 django/__init__.py                                |  2 +-
 django/core/management/commands/makemigrations.py | 19 ++++--
 django/db/migrations/operations/models.py         |  4 ++
 django/utils/html.py                              |  6 +-
 django/utils/http.py                              | 10 ++-
 docs/howto/custom-template-tags.txt               |  2 +-
 docs/howto/deployment/wsgi/modwsgi.txt            |  8 +++
 docs/intro/tutorial05.txt                         |  8 +--
 docs/ref/applications.txt                         |  2 +-
 docs/ref/contrib/admin/actions.txt                |  2 +-
 docs/ref/contrib/gis/gdal.txt                     | 13 ++--
 docs/ref/contrib/staticfiles.txt                  |  6 ++
 docs/ref/databases.txt                            |  2 +-
 docs/ref/files/uploads.txt                        |  4 +-
 docs/ref/models/fields.txt                        | 16 ++++-
 docs/ref/models/querysets.txt                     |  5 ++
 docs/ref/schema-editor.txt                        |  3 -
 docs/ref/templates/api.txt                        |  5 ++
 docs/releases/1.4.20.txt                          | 26 ++++++++
 docs/releases/1.6.11.txt                          | 43 +++++++++++++
 docs/releases/1.7.7.txt                           | 54 ++++++++++++++++
 docs/releases/1.7.txt                             | 18 +++++-
 docs/releases/index.txt                           |  3 +
 docs/topics/auth/default.txt                      |  5 ++
 docs/topics/db/sql.txt                            |  2 +-
 docs/topics/forms/modelforms.txt                  | 77 ++++++++++++-----------
 docs/topics/migrations.txt                        | 69 +++++---------------
 tests/migrations/test_commands.py                 | 45 +++++++++++++
 tests/migrations/test_operations.py               | 35 +++++++++++
 tests/utils_tests/test_html.py                    |  3 +
 tests/utils_tests/test_http.py                    |  4 +-
 35 files changed, 387 insertions(+), 122 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-django.git