Bill Burke 10eba78036 Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/profile/ecp/SamlEcpProfileProtocolFactory.java

2016-01-04 11:25:14 -05:00

..

src

Merge remote-tracking branch 'upstream/master'

2016-01-04 11:25:14 -05:00

pom.xml

Version bump

2015-12-01 19:54:28 +01:00