[shibboleth-sp2] 03/06: Merge tag 'upstream/2.5.3+dfsg'

[Russ Allbery]

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

rra pushed a commit to branch master
in repository shibboleth-sp2.

commit 3fa6d45108c1d88d09933a2b0e86606dcde6bae1
Merge: af1fc94 055935b
Author: Russ Allbery <rra at debian.org>
Date:   Sat Dec 7 20:01:40 2013 -0800

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

 adfs/adfs.rc                                | 10 +++++-----
 apache/mod_shib.cpp                         | 11 ++++++++---
 apache/mod_shib_13.rc                       | 10 +++++-----
 apache/mod_shib_20.rc                       | 10 +++++-----
 apache/mod_shib_22.rc                       | 10 +++++-----
 apache/mod_shib_24.rc                       | 10 +++++-----
 build-aux/ltmain.sh                         |  4 ++--
 config_win32.h                              |  6 +++---
 configs/apache.config.in                    |  3 ++-
 configs/apache2.config.in                   |  3 ++-
 configs/apache22.config.in                  |  3 ++-
 configs/apache24.config.in                  |  2 +-
 configs/postTemplate.html                   | 10 +++-------
 configs/shibd-redhat.in                     |  4 +---
 configure                                   | 20 ++++++++++----------
 configure.ac                                |  2 +-
 fastcgi/Makefile.in                         | 12 ++++++++----
 fastcgi/shibauthorizer.rc                   | 10 +++++-----
 fastcgi/shibresponder.rc                    | 10 +++++-----
 isapi_shib/isapi_shib.rc                    | 10 +++++-----
 memcache-store/memcache-store.rc            | 12 ++++++------
 nsapi_shib/nsapi_shib.rc                    | 10 +++++-----
 odbc-store/odbc-store.rc                    | 12 ++++++------
 plugins/plugins.rc                          | 10 +++++-----
 schemas/shibboleth-2.0-native-sp-config.xsd |  3 ++-
 shibboleth.spec                             |  2 +-
 shibd/shibd.rc                              | 10 +++++-----
 shibsp/Makefile.am                          |  8 ++++----
 shibsp/Makefile.in                          |  8 ++++----
 shibsp/SPConfig.cpp                         | 15 ++++++++-------
 shibsp/handler/impl/AbstractHandler.cpp     |  4 ++--
 shibsp/metadata/DynamicMetadataProvider.cpp |  7 +++++++
 shibsp/shibsp.rc                            | 10 +++++-----
 shibsp/version.h                            |  2 +-
 util/mdquery.rc                             | 10 +++++-----
 util/resolvertest.rc                        | 10 +++++-----
 36 files changed, 154 insertions(+), 139 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git