[med-svn] [conquest-dicom-server] 08/17: Merge branch 'master' into manpage

[Pablo Lorenzzoni]

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

spectra pushed a commit to branch master
in repository conquest-dicom-server.

commit 7300472a49455565d1eb646abc56f643fb04fc04
Merge: 3845414 05b62c3
Author: Pablo Lorenzzoni <spectra at debian.org>
Date:   Sat Feb 1 11:14:09 2014 +0000

    Merge branch 'master' into manpage
    
    Prepare to mess with patching PrintOptions

 ...standard-debian-location-for-config-files.patch} | 16 +++++++++++-----
 .../patches/0002-Use-IANA-port-for-the-daemon.patch | 21 +++++++++++++++++++++
 ...configfiles-with-path-in-dicom.ini.sqlite.patch} | 18 ++++++++++++------
 ...-Add-logfiles-location-to-dicom.ini.sqlite.patch | 20 ++++++++++++++++++++
 debian/patches/ianaport.patch                       | 15 ---------------
 debian/patches/logfiles.patch                       | 14 --------------
 debian/patches/series                               |  8 ++++----
 7 files changed, 68 insertions(+), 44 deletions(-)

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