[midPoint-git] midPoint branch master updated. v2.3devel-328-g2318554

[Radovan Semancik]

Project "midPoint" branch master has been updated
       via  2318554fa24a382619e984b267a25c3e013f8187 (commit) v2.3devel-328-g2318554
       via  738c0ecb8a10bf52eb21d7283d62054309d9e789 (commit) v2.3devel-322-g738c0ec
      from  86d5e7dca6f783eea636e4d14fe9ab30ee639bc1 (commit) v2.3devel-326-g86d5e7d

- Log -----------------------------------------------------------------
commit 2318554fa24a382619e984b267a25c3e013f8187
Merge: 738c0ec 86d5e7d
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date:   Fri Dec 6 09:58:59 2013 +0100

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

commit 738c0ecb8a10bf52eb21d7283d62054309d9e789
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date:   Fri Dec 6 09:58:33 2013 +0100

    Fixing the scripting hooks.

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

(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/prism/delta/ContainerDelta.java       |    2 +-
 .../midpoint/model/intest/TestScriptHooks.java     |    2 +-
 .../scripthooks/system-configuration-hooks.xml     |    3 ++-
 .../model/test/AbstractModelIntegrationTest.java   |    6 +++++-
 4 files changed, 9 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
midPoint