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

Merge remote-tracking branch 'origin/svn'

Change-Id: Iacf80b151f71a6fcfa294fe48d3ed57e6ce72b10
---

80950353e90c09d866b9748a0ad3ddd726d6f3b4