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

[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 bcb65cda4f3d95fdf56e86fe89f0049ba9b15340
Merge: 83f2bc6 bf3660b
Author: Andreas Tille <tille at debian.org>
Date:   Wed Aug 3 16:28:51 2016 +0200

    Merge tag 'upstream/21.8'
    
    Upstream version 21.8

 server/bootstrap/fixup_db-v21.conf                 |   1 +
 server/bootstrap/update_db-v20_v21.conf            |   5 +-
 server/doc/schema/gnumed-entire_schema.html        |   2 +-
 server/pycommon/gmDateTime.py                      |   8 +
 server/pycommon/gmTools.py                         |  42 +-
 server/sql/v20-v21/data/v21-Begleitbrief.tex       |   2 +-
 ...dikationsplan_AMTS-2.3-nicht_konform-blanko.tex | 417 +++++++++++++++++++
 .../v21-Medikationsplan_AMTS-2.3-nicht_konform.tex | 447 ++++++++++++++++++++
 .../v20-v21/data/v21-Medikationsplan_AMTS-2.3.tex  | 463 +++++++++++++++++++++
 .../v20-v21/dynamic/v21-release_notes-dynamic.sql  |  45 +-
 .../fixups/v21-AMTS_Medikationsplan-fixup.sql      | 112 +++++
 .../v21-ref-auto_hint-klug_entscheiden_pulmo.sql   |  61 +--
 .../python/v21-import-form-template-fixups.py      |  46 +-
 13 files changed, 1566 insertions(+), 85 deletions(-)

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