[midPoint-git] midPoint branch bootstrap updated. v2.3devel-462-gd09333a

[Vilo Repan]

Project "midPoint" branch bootstrap has been updated
       via  d09333a3580a568158168ebba1f9e0cc4d53eb68 (commit) v2.3devel-462-gd09333a
       via  afebbded3b2e6b4c14504680d8e460b3781afbe2 (commit) v2.3devel-238-gafebbde
       via  871a112243052a2c8c019cd23123fe015bbaf3c1 (commit) v2.3devel-237-g871a112
      from  62fef7baead1e35fe146731387c24e7140da6e18 (commit) v2.3devel-459-g62fef7b

- Log -----------------------------------------------------------------
commit d09333a3580a568158168ebba1f9e0cc4d53eb68
Merge: 62fef7b afebbde
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Tue Nov 26 12:47:13 2013 +0100

    Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint into bootstrap
    
    Conflicts:
    	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java

-----------------------------------------------------------------------

(Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full)

Summary of changes:
 .../repo/sql/SqlRepositoryServiceImpl.java         |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
midPoint