Merge remote-tracking branch 'upstream/master'
authorFl0-0 <root@localhost.localdomain>
Sun, 2 Jul 2017 15:54:35 +0000 (17:54 +0200)
committerFl0-0 <root@localhost.localdomain>
Sun, 2 Jul 2017 15:54:35 +0000 (17:54 +0200)

Trivial merge
Impressum, Datenschutz