=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroup.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroup.java 2015-10-05 07:55:19 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroup.java 2015-10-07 07:03:31 +0000 @@ -79,6 +79,7 @@ @Scanned private Set dataSets = new HashSet<>(); + @Scanned private Set programs = new HashSet<>(); // ------------------------------------------------------------------------- @@ -255,8 +256,7 @@ } else if ( strategy.isMerge() ) { - description = userAuthorityGroup.getDescription() == null ? description : userAuthorityGroup - .getDescription(); + description = userAuthorityGroup.getDescription() == null ? description : userAuthorityGroup.getDescription(); } removeAllAuthorities();