<html>
<head>
</head>
<body>
<table border='0' cellpadding='3'>
<tr><td>Author: </td><td><b>lazyman</b></td></tr>
<tr><td>Date:</td><td>2013-02-22 21:20:14 +0100 (Fri, 22 Feb 2013)</td></tr>
<tr><td>New Revision: </td><td>5154</td></tr>
</table>
<hr/><b>Log:</b><div style='padding-left: 20px; color:black'>
Merge all from trunk at 5153<br/>
</div><hr/>
<b>Added:</b><div style='padding-left: 20px; color:green'>
branches/wicket6/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResourceModifications.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResourceModifications.java?r=5154"><see></a><br/>
</div>
<b>Modified:</b><div style='padding-left: 20px; color:blue'>
branches/wicket6/ <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/?r2=5154&r1=5153"><see></a><br/>
branches/wicket6/gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject_en_US.utf8.properties <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject_en_US.utf8.properties?r2=5154&r1=5153"><see></a><br/>
branches/wicket6/gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject_sk_SK.utf8.properties <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject_sk_SK.utf8.properties?r2=5154&r1=5153"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java?r2=5154&r1=5153"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java?r2=5154&r1=5153"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.java?r2=5154&r1=5153"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.properties <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.properties?r2=5154&r1=5153"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageHome.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageHome.java?r2=5154&r1=5153"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java?r2=5154&r1=5153"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUserPreview.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUserPreview.java?r2=5154&r1=5153"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUserPreview.properties <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUserPreview.properties?r2=5154&r1=5153"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/SubmitPropertiesDto.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/SubmitPropertiesDto.java?r2=5154&r1=5153"><see></a><br/>
branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/expression/script/jsr223/Jsr223ScriptEvaluator.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/expression/script/jsr223/Jsr223ScriptEvaluator.java?r2=5154&r1=5153"><see></a><br/>
branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/validator/Validator.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/validator/Validator.java?r2=5154&r1=5153"><see></a><br/>
branches/wicket6/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensFocusContext.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensFocusContext.java?r2=5154&r1=5153"><see></a><br/>
branches/wicket6/model/model-intest/pom.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-intest/pom.xml?r2=5154&r1=5153"><see></a><br/>
branches/wicket6/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestOrgStruct.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestOrgStruct.java?r2=5154&r1=5153"><see></a><br/>
branches/wicket6/model/model-intest/src/test/resources/common/resource-dummy.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-intest/src/test/resources/common/resource-dummy.xml?r2=5154&r1=5153"><see></a><br/>
branches/wicket6/model/model-intest/testng.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-intest/testng.xml?r2=5154&r1=5153"><see></a><br/>
branches/wicket6/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java?r2=5154&r1=5153"><see></a><br/>
branches/wicket6/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java?r2=5154&r1=5153"><see></a><br/>
branches/wicket6/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerConfiguration.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerConfiguration.java?r2=5154&r1=5153"><see></a><br/>
branches/wicket6/samples/resources/csvfile/localhost-csvfile-resource-advanced-nosync-2.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/samples/resources/csvfile/localhost-csvfile-resource-advanced-nosync-2.xml?r2=5154&r1=5153"><see></a><br/>
branches/wicket6/samples/resources/csvfile/midpoint-flatfile-2.csv <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/samples/resources/csvfile/midpoint-flatfile-2.csv?r2=5154&r1=5153"><see></a><br/>
</div>
</body></html>