[med-svn] [orthanc] 02/05: Merge tag 'upstream/0.9.6+dfsg'

[Sebastien Jodogne]

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

jodogne-guest pushed a commit to branch master
in repository orthanc.

commit 28abb1829ae5fdd417f30eb28341a1b97ef11acf
Merge: 41c757d 8bc8099
Author: jodogne-guest <s.jodogne at gmail.com>
Date:   Fri Dec 11 08:56:36 2015 +0100

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

 .hg_archival.txt                             |  6 ++---
 CMakeLists.txt                               |  2 +-
 Core/HttpServer/HttpOutput.cpp               |  2 +-
 NEWS                                         | 11 +++++++++
 OrthancServer/FromDcmtkBridge.cpp            | 21 +++++++++++++----
 OrthancServer/Search/HierarchicalMatcher.cpp |  6 ++---
 OrthancServer/ServerToolbox.cpp              | 32 ++++++++++++++++++--------
 OrthancServer/SliceOrdering.cpp              | 13 ++++++++++-
 OrthancServer/main.cpp                       | 34 +++++++++++++++++++++++++---
 Resources/Configuration.json                 |  2 +-
 10 files changed, 102 insertions(+), 27 deletions(-)

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