Files
sailing-analytics/java/com.sap.sse.security.common
Axel Uhl c356c2f97c Merge branch 'master' into bug2589
Conflicts:
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/security/Permission.java
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/security/SailingPermissionsForRoleProvider.java

Change-Id: I3aaf2651c01460dd2fb0caf95735b9919586a2c9
2016-03-01 16:47:00 +01:00
..
…
2015-02-27 15:03:11 +01:00