From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Tue, 6 Dec 2016 12:33:30 +0000 (+0200)
Subject: Merge commit '876ede6'
X-Git-Tag: v1.25.0~19
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=06718abb2b3cc780748553811c4857c165499809;p=simantics%2Fplatform.git

Merge commit '876ede6'

Conflicts:
	bundles/org.simantics.acorn/build.properties
	bundles/org.simantics.charts/META-INF/MANIFEST.MF
	features/org.simantics.acorn.feature/.project
---

06718abb2b3cc780748553811c4857c165499809