Merge commit '876ede6'
authorTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Tue, 6 Dec 2016 12:33:30 +0000 (14:33 +0200)
committerTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Tue, 6 Dec 2016 12:33:30 +0000 (14:33 +0200)
Conflicts:
bundles/org.simantics.acorn/build.properties
bundles/org.simantics.charts/META-INF/MANIFEST.MF
features/org.simantics.acorn.feature/.project


Trivial merge