[midPoint-git] midPoint branch bootstrap updated. v2.3devel-218-g555f88e

[Vilo Repan]

Project "midPoint" branch bootstrap has been updated
       via  555f88e95582de597f88324fa956e8012adf7ed4 (commit) v2.3devel-218-g555f88e
       via  fc0987f8c7add5f96ea0b4a70509210d0e890f09 (commit) v2.3devel-217-gfc0987f
       via  f2d259c628a4397f5e02e3feecaa060dbcbdc993 (commit) v2.3devel-121-gf2d259c
      from  ae22df51d27814b41b33e005d950d40eb53e5539 (commit) v2.3devel-215-gae22df5

- Log -----------------------------------------------------------------
commit 555f88e95582de597f88324fa956e8012adf7ed4
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Fri Oct 18 17:14:04 2013 +0200

    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/configuration/PageDebugList.java

commit fc0987f8c7add5f96ea0b4a70509210d0e890f09
Merge: ae22df5 f2d259c
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Fri Oct 18 17:13:58 2013 +0200

    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/configuration/PageDebugList.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:
 .../web/component/dialog/ConfirmationDialog.java   |    5 +
 .../page/admin/configuration/PageDebugList.java    |  141 +++++++++++---------
 2 files changed, 85 insertions(+), 61 deletions(-)


hooks/post-receive
-- 
midPoint