Merge commit 'd7afa23'
authorTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Fri, 11 Nov 2016 10:41:05 +0000 (12:41 +0200)
committerTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Fri, 11 Nov 2016 10:41:05 +0000 (12:41 +0200)
commit36282d240b9ac295894a6705672efa11eb26e4d2
treeb87f187d4682a93ed106e04e0f93d87325c68d3b
parentc08364c64a0bb53c45c052a3e4cea8702bbd69a0
parentd7afa23a3b01c4d83f1e0088a8d7e28c21feb936
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