[med-svn] [gnumed-server] 02/03: Merge tag 'upstream/21.3'

[Andreas Tille]

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

tille pushed a commit to branch master
in repository gnumed-server.

commit 6a063ab010e68fbe305aec6f4dd69dbeb0e8290c
Merge: cb73424 8c071ee
Author: Andreas Tille <tille at debian.org>
Date:   Thu Apr 7 21:23:40 2016 +0200

    Merge tag 'upstream/21.3'
    
    Upstream version 21.3

 server/bootstrap/fixup_db-v21.conf                 |   1 +
 .../{fixup_db-v21.conf => fixup_db-v22.conf}       |  22 ++--
 server/bootstrap/update_db-v20_v21.conf            |   2 +
 ...date_db-v20_v21.conf => update_db-v21_v22.conf} | 133 ++++++---------------
 server/doc/schema/gnumed-entire_schema.html        |   2 +-
 server/pycommon/gmI18N.py                          |  21 ++--
 server/pycommon/gmTools.py                         |   2 +-
 .../sql/v20-v21/dynamic/v21-dem-region-dynamic.sql |  20 +++-
 .../v20-v21/dynamic/v21-release_notes-dynamic.sql  |  37 +++---
 .../v20-v21/fixups/v21-dem-view_grants-fixup.sql   |  25 ++++
 10 files changed, 118 insertions(+), 147 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/gnumed-server.git