Merge commit '3b5069d' into develop
authorTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Fri, 30 Sep 2016 13:31:32 +0000 (16:31 +0300)
committerTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Fri, 30 Sep 2016 13:31:32 +0000 (16:31 +0300)
commit0580ea8b675c868685993b0780c9ecc31010f681
treed622ae2976f31a1b2e608e7a4723706f6ae7b674
parenta0b1831418eba8870ca849ef2cd85823aa7bfa0a
parent3b5069d0d30e7de27f73d88d5e89d29052291a34
Merge commit '3b5069d' into develop

refs #6726