<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-03-02 11:36:19 +0100 (Sat, 02 Mar 2013)</td></tr>
<tr><td>New Revision: </td><td>5231</td></tr>
</table>
<hr/><b>Log:</b><div style='padding-left: 20px; color:black'>
Merge all from trunk at 5230<br/>
</div><hr/>
<b>Modified:</b><div style='padding-left: 20px; color:blue'>
branches/wicket6/ <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/?r2=5231&r1=5230"><see></a><br/>
branches/wicket6/gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel_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/component/assignment/AssignmentEditorPanel_en_US.utf8.properties?r2=5231&r1=5230"><see></a><br/>
branches/wicket6/gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/PageBase_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/PageBase_en_US.utf8.properties?r2=5231&r1=5230"><see></a><br/>
branches/wicket6/gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/users/PageUserPreview_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/users/PageUserPreview_en_US.utf8.properties?r2=5231&r1=5230"><see></a><br/>
branches/wicket6/gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/security/MidPointApplication_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/security/MidPointApplication_en_US.utf8.properties?r2=5231&r1=5230"><see></a><br/>
branches/wicket6/gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel_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/component/assignment/AssignmentEditorPanel_sk_SK.utf8.properties?r2=5231&r1=5230"><see></a><br/>
branches/wicket6/gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/PageBase_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/PageBase_sk_SK.utf8.properties?r2=5231&r1=5230"><see></a><br/>
branches/wicket6/gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/users/PageUserPreview_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/users/PageUserPreview_sk_SK.utf8.properties?r2=5231&r1=5230"><see></a><br/>
branches/wicket6/gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/security/MidPointApplication_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/security/MidPointApplication_sk_SK.utf8.properties?r2=5231&r1=5230"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.properties <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.properties?r2=5231&r1=5230"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java?r2=5231&r1=5230"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/webapp/WEB-INF/ctx-security.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/webapp/WEB-INF/ctx-security.xml?r2=5231&r1=5230"><see></a><br/>
branches/wicket6/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java?r2=5231&r1=5230"><see></a><br/>
</div>
</body></html>