From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Fri, 11 Nov 2016 10:41:05 +0000 (+0200)
Subject: Merge commit 'd7afa23'
X-Git-Tag: v1.25.0~53
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=36282d240b9ac295894a6705672efa11eb26e4d2;p=simantics%2Fplatform.git

Merge commit 'd7afa23'

Conflicts:
	bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/adapter/impl/EntityInstances.java

Sync git svn branch with SVN repository r33389.

refs #6726
---

36282d240b9ac295894a6705672efa11eb26e4d2