Conflicts:
	cas-server-support-spnego/src/main/java/org/jasig/cas/support/spnego/authentication/handler/support/JCIFSSpnegoAuthenticationHandler.java

If your localhost is ipv6, with default configuration JCIFS NTLM process will try to connect to a pseudo-random server:
http://article.gmane.org/gmane.network.samba.java/9539

Conflicts:
	cas-server-support-spnego/src/main/java/org/jasig/cas/support/spnego/authentication/handler/support/JCIFSSpnegoAuthenticationHandler.java

required for casOpenIdServiceSuccessView.jsp

Exclude Restlet endpoints from Security Filter Mapping

SAML attributes should be fetched off of primary authN

Backported memcached+kryo update to 4.0.4

Conflicts:
	cas-server-core/src/main/java/org/jasig/cas/authentication/SuccessfulHandlerMetaDataPopulator.java

CAS-1056 Updated Spring to version 3.2.9 due to SPR-11719

Upgrade CAS 4.0.x to Pac4j 1.7.x

When an invalid TGT is present on the client, gateway=true was being ignored.

Conflicts:
	cas-management-webapp/src/main/resources/messages_pl.properties

Properly encode urls & parameters