From: Hannu Niemistö <hannu.niemisto@semantum.fi>
Date: Mon, 15 Aug 2016 11:19:15 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/svn'
X-Git-Tag: v1.25.0~180
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=3303fe4a3b363e88662ac75a4f7e873ddb3ab352;p=simantics%2Fplatform.git

Merge remote-tracking branch 'origin/svn'

Change-Id: I478743179fe637965255b3ed1d7d03c0fc0c54ab
---

3303fe4a3b363e88662ac75a4f7e873ddb3ab352