Merge branch 'devel' of public.inteno.se:juci into devel
authorJari M <jari@netmedia.fi>
Thu, 24 Mar 2016 13:37:17 +0000 (15:37 +0200)
committerJari M <jari@netmedia.fi>
Thu, 24 Mar 2016 13:37:17 +0000 (15:37 +0200)

Trivial merge