[med-svn] [gnumed-client] 04/04: Merge tag 'upstream/1.6.11+dfsg'

[Andreas Tille]

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

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

commit 9a63ec20cb182e9538c2da547cf85342beaabb3c
Merge: de1647d 2cbc463
Author: Andreas Tille <tille at debian.org>
Date:   Thu Dec 29 08:08:24 2016 +0100

    Merge tag 'upstream/1.6.11+dfsg'
    
    Upstream version 1.6.11+dfsg

 client/CHANGELOG                            |  23 +++++
 client/business/gmClinNarrative.py          |  74 +++++++-------
 client/business/gmMedication.py             |  12 +--
 client/doc/schema/gnumed-entire_schema.html |   2 +-
 client/gnumed.py                            |   2 +-
 client/po/de-gnumed.mo                      | Bin 493408 -> 493483 bytes
 client/po/de.po                             |  21 ++--
 client/pycommon/gmNetworkTools.py           |   3 +-
 client/pycommon/gmPG2.py                    | 143 +++++++++++++++++++++-------
 client/wxpython/gmDocumentWidgets.py        |   2 +-
 client/wxpython/gmEMRStructWidgets.py       |   6 ++
 client/wxpython/gmEditArea.py               |   1 +
 client/wxpython/gmGuiMain.py                |   2 +-
 client/wxpython/gmMacro.py                  |   2 +
 client/wxpython/gmPatOverviewWidgets.py     |  40 ++++++--
 client/wxpython/gmSubstanceMgmtWidgets.py   |   2 +-
 external-tools/gm-create_datamatrix         |   1 -
 external-tools/gm-describe_file             |  15 ++-
 18 files changed, 251 insertions(+), 100 deletions(-)

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