[libopensaml2-java] 04/07: Merge tag 'upstream/2.6.2'

[Tony Mancill]

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

tmancill pushed a commit to branch master
in repository libopensaml2-java.

commit d3e5352f446ad36cbfefd14070c5108bd2bffaa8
Merge: cf66d28 f3836a0
Author: tony mancill <tmancill at debian.org>
Date:   Wed Aug 27 17:52:35 2014 -0700

    Merge tag 'upstream/2.6.2'
    
    Upstream version 2.6.2
    
    Conflicts:
    	pom.xml

 .checkstyle                                          |  2 +-
 doc/RELEASE-NOTES.txt                                |  7 +++++++
 pom.xml                                              |  6 +++---
 src/main/java/org/opensaml/DefaultBootstrap.java     | 20 ++++++++++++++++++++
 .../org/opensaml/saml1/core/AssertionArtifact.java   | 14 +++++++++-----
 .../java/org/opensaml/saml1/core/StatusCode.java     | 14 ++++++++++----
 .../java/org/opensaml/saml1/core/StatusDetail.java   |  2 +-
 .../java/org/opensaml/saml1/core/StatusMessage.java  | 13 +++++++++----
 src/main/java/org/opensaml/saml1/core/Subject.java   |  2 +-
 .../opensaml/saml2/core/RequestedAuthnContext.java   |  2 +-
 .../opensaml/security/SAMLMDCredentialContext.java   | 10 ++++++++++
 11 files changed, 72 insertions(+), 20 deletions(-)


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