[med-svn] [gnumed-server] 02/05: Merge tag 'upstream/21.2'

[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 7488b683bc6b1df24359874895ccef6d8b434737
Merge: ab131b0 428af1a
Author: Andreas Tille <tille at debian.org>
Date:   Mon Mar 28 08:16:00 2016 +0200

    Merge tag 'upstream/21.2'
    
    Upstream version 21.2

 server/bootstrap/bootstrap_gm_db_system.py         |  37 ++++++--
 server/bootstrap/update_db-v20_v21.conf            |  72 ++++++++-------
 server/doc/schema/gnumed-entire_schema.html        |   2 +-
 .../v20-v21/dynamic/v21-release_notes-dynamic.sql  | 102 ++++-----------------
 4 files changed, 88 insertions(+), 125 deletions(-)

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