[midPoint-git] midPoint branch bootstrap updated. v2.3devel-394-gbd57160

[Vilo Repan]

Project "midPoint" branch bootstrap has been updated
       via  bd571605b18a90dd01f5720321be8176f77fb415 (commit) v2.3devel-394-gbd57160
       via  06f799138078dea8bd8bfb37f764931a1ff68418 (commit) v2.3devel-393-g06f7991
       via  7c394b61724ebba2f3eec52e6e49183e1e8c2098 (commit) v2.3devel-201-g7c394b6
       via  c29dfa5714610581c2329b65838779f74272617e (commit) v2.3devel-391-gc29dfa5
       via  1da77c8623cec4855c8a5f7a9f53638f188bacad (commit) v2.3devel-200-g1da77c8
      from  81c5350638469a7525f26219a0b7ccc3e40f829f (commit) v2.3devel-389-g81c5350

- Log -----------------------------------------------------------------
commit bd571605b18a90dd01f5720321be8176f77fb415
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Mon Nov 18 14:13:56 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

commit 06f799138078dea8bd8bfb37f764931a1ff68418
Merge: c29dfa5 7c394b6
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Mon Nov 18 14:13:39 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

commit c29dfa5714610581c2329b65838779f74272617e
Merge: 81c5350 1da77c8
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Mon Nov 18 11:20:53 2013 +0100

    Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint into bootstrap

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

(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:
 .../midpoint/web/page/admin/users/PageUser.java    |    2 +-
 .../midpoint/tools/ninja/ImportObjects.java        |    6 ++++--
 .../com/evolveum/midpoint/tools/ninja/Main.java    |    6 +++++-
 3 files changed, 10 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
midPoint