Merge branch 'timefunc-new'
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Fri, 5 Apr 2019 14:23:44 +0000 (16:23 +0200)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Fri, 5 Apr 2019 14:23:44 +0000 (16:23 +0200)

Trivial merge