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)
commitf118c53ecbd955d9cbe9ae7e534c93d4f684172c
tree31e990eb8308b5d30e1cf2c7c0f65615481b2554
parent604d54a0bb3509ea48d143bba01d3c241453761d
parentd9182dd2f469ec9305021c1a25b73efe9dfc5c33
Merge branch 'lmanul-master'