Merge remote-tracking branch 'realraum/master'
authornicoo <nicoo@realraum.at>
Sat, 24 Nov 2018 15:12:31 +0000 (16:12 +0100)
committernicoo <nicoo@realraum.at>
Sat, 24 Nov 2018 15:12:31 +0000 (16:12 +0100)

Trivial merge