[orthanc/f21: 2/2] Merge branch 'master' into f21

[Sebastien Jodogne]

commit 39a8106648b1f12ffa338f0f57a47c4e34b6a2df
Merge: 054d075 9f08028
Author: Sebastien Jodogne <s.jodogne at gmail.com>
Date:   Tue Nov 4 17:26:44 2014 +0100

    Merge branch 'master' into f21

 .gitignore                                         |    1 +
 ...-0.8.3-lib64.patch => orthanc-0.8.5-lib64.patch |   12 +++++-----
 orthanc.json                                       |   23 ++++++++++++++++---
 orthanc.spec                                       |    5 +++-
 sources                                            |    2 +-
 5 files changed, 31 insertions(+), 12 deletions(-)
---