[midPoint-git] midPoint branch master updated. v2.3devel-1207-gb312708

[Vilo Repan]

Project "midPoint" branch master has been updated
       via  b312708fdd43359d231d9baf4a76d8fad29ea3c1 (commit) v2.3devel-1207-gb312708
       via  3d43593fac877cdbd3fae479f52f0f40b5f2978a (commit) v2.3devel-1205-g3d43593
       via  0b8254524cf2ea21782d275f9ee98e726ff680ad (commit) v2.3devel-1204-g0b82545
      from  2966e27ae037eb80b960e2b860ffe0a6d93f1105 (commit) v2.3devel-1204-g2966e27

- Log -----------------------------------------------------------------
commit b312708fdd43359d231d9baf4a76d8fad29ea3c1
Merge: 3d43593 2966e27
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Tue Mar 4 12:39:55 2014 +0100

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

commit 3d43593fac877cdbd3fae479f52f0f40b5f2978a
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Tue Mar 4 12:39:40 2014 +0100

    disabling resource wizard.

commit 0b8254524cf2ea21782d275f9ee98e726ff680ad
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Tue Mar 4 12:04:37 2014 +0100

    disabled sample dashboard charts.

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

(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/PageAdmin.java         |    3 ++-
 .../page/admin/home/component/SystemInfoPanel.html |   14 ++++++++------
 .../page/admin/home/component/SystemInfoPanel.java |   13 ++++++-------
 .../page/admin/resources/PageResourceWizard.java   |   12 ++++--------
 .../src/main/webapp/WEB-INF/descriptor.xml         |    8 ++++----
 5 files changed, 24 insertions(+), 26 deletions(-)


hooks/post-receive
-- 
midPoint