<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-05 14:08:18 +0100 (Tue, 05 Feb 2013)</td></tr>
<tr><td>New Revision: </td><td>5005</td></tr>
</table>
<hr/><b>Log:</b><div style='padding-left: 20px; color:black'>
Merge all from trunk at 5004<br/>
</div><hr/>
<b>Added:</b><div style='padding-left: 20px; color:green'>
branches/dbsupport/model/model-impl/src/main/java/com/evolveum/midpoint/model/controller/SelfTestData.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/dbsupport/model/model-impl/src/main/java/com/evolveum/midpoint/model/controller/SelfTestData.java?r=5005"><see></a><br/>
branches/dbsupport/model/model-intest/src/test/resources/strange/treasure-island.txt <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/dbsupport/model/model-intest/src/test/resources/strange/treasure-island.txt?r=5005"><see></a><br/>
</div>
<b>Modified:</b><div style='padding-left: 20px; color:blue'>
branches/dbsupport/ <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/dbsupport/?r2=5005&r1=5004"><see></a><br/>
branches/dbsupport/infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/dbsupport/infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java?r2=5005&r1=5004"><see></a><br/>
branches/dbsupport/infra/prism/src/main/resources/xml/ns/public/annotation-2.xsd <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/dbsupport/infra/prism/src/main/resources/xml/ns/public/annotation-2.xsd?r2=5005&r1=5004"><see></a><br/>
branches/dbsupport/infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/dbsupport/infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java?r2=5005&r1=5004"><see></a><br/>
branches/dbsupport/model/model-impl/src/main/java/com/evolveum/midpoint/model/controller/ModelDiagController.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/dbsupport/model/model-impl/src/main/java/com/evolveum/midpoint/model/controller/ModelDiagController.java?r2=5005&r1=5004"><see></a><br/>
branches/dbsupport/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/dbsupport/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java?r2=5005&r1=5004"><see></a><br/>
branches/dbsupport/model/model-intest/src/test/resources/schema/piracy.xsd <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/dbsupport/model/model-intest/src/test/resources/schema/piracy.xsd?r2=5005&r1=5004"><see></a><br/>
branches/dbsupport/model/model-intest/src/test/resources/strange/user-deghoulash.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/dbsupport/model/model-intest/src/test/resources/strange/user-deghoulash.xml?r2=5005&r1=5004"><see></a><br/>
</div>
</body></html>