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

[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 586e28a201f801ed88e32d549562b3b4a489bfb1
Merge: 4d4e13d 8c2ac71
Author: Andreas Tille <tille at debian.org>
Date:   Sun Jan 31 08:44:10 2016 +0100

    Merge tag 'upstream/20.10'
    
    Upstream version 20.10

 server/bootstrap/fixup_db-v20.conf                 |  3 +
 server/bootstrap/update_db-v19_v20.conf            |  5 +-
 server/doc/schema/gnumed-entire_schema.html        |  2 +-
 server/pycommon/gmNull.py                          |  4 +-
 .../sql/v18-v19/fixups/v19-dem-org-idx-fixup.sql   |  6 +-
 .../sql/v18-v19/superuser/v19-install-pg_trgm.sql  |  9 ++-
 .../v19-v20/dynamic/v20-release_notes-dynamic.sql  | 17 +++--
 .../fixups/v20-clin-substance_intake-fixup.sql     | 79 ++++++++++++++++++++++
 .../fixups/v20-dem-org-idx-fixup.sql}              | 15 +---
 .../superuser/v20-install-pg_trgm.sql}             |  9 ++-
 10 files changed, 115 insertions(+), 34 deletions(-)

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