Merge branch 'lmanul-master'
authorSuperBFG7 <daniel@despite.ch>
Mon, 18 Dec 2017 14:00:56 +0000 (15:00 +0100)
committerSuperBFG7 <daniel@despite.ch>
Mon, 18 Dec 2017 14:00:56 +0000 (15:00 +0100)

Trivial merge