From: Hannu Niemistö <hannu.niemisto@semantum.fi>
Date: Tue, 16 Aug 2016 10:18:51 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/svn'
X-Git-Tag: v1.25.0~175
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=93771ec80d6630bf6b31b1bf9f62b05277e95074;p=simantics%2Fplatform.git

Merge remote-tracking branch 'origin/svn'

Change-Id: I59e937dd070a311f4d80579bbdfdc4589a16889a
---

93771ec80d6630bf6b31b1bf9f62b05277e95074