<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-23 20:14:02 +0100 (Sat, 23 Feb 2013)</td></tr>
<tr><td>New Revision: </td><td>5158</td></tr>
</table>
<hr/><b>Log:</b><div style='padding-left: 20px; color:black'>
Merge all from trunk at 5157<br/>
</div><hr/>
<b>Removed:</b><div style='padding-left: 20px; color:red; text-decoration:line-through;'>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/MidpointServletContextListener.java<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=5158&r1=5157"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/webapp/WEB-INF/web.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/webapp/WEB-INF/web.xml?r2=5158&r1=5157"><see></a><br/>
branches/wicket6/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/LocalNodeManager.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/LocalNodeManager.java?r2=5158&r1=5157"><see></a><br/>
branches/wicket6/repo/task-quartz-impl/src/main/resources/com/evolveum/midpoint/task/quartzimpl/execution/tables_sqlServer.sql <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/repo/task-quartz-impl/src/main/resources/com/evolveum/midpoint/task/quartzimpl/execution/tables_sqlServer.sql?r2=5158&r1=5157"><see></a><br/>
</div>
</body></html>