• Misagh Moayyed's avatar
    Merge branch 'master' into cache-guava · 0dc14dd1
    Misagh Moayyed authored
    Conflicts:
    	cas-management-webapp/src/main/java/org/jasig/cas/services/web/beans/RegisteredServiceEditBean.java
    	cas-server-core/src/main/java/org/jasig/cas/authentication/principal/CachingPrincipalAttributesRepository.java
    0dc14dd1