Merge branch 'master' of ssh://www.simantics.org:29418/simantics/platform
authorTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Fri, 9 Sep 2016 13:05:42 +0000 (16:05 +0300)
committerTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Fri, 9 Sep 2016 13:05:42 +0000 (16:05 +0300)

Trivial merge