Merge branch 'master' into dont-use-sighup
commite5451d73c2c3813d3f1b71a194d78676d7ade124
authorTheAssassin <theassassin@assassinate-you.net>
Tue, 8 Jan 2019 12:33:48 +0000 (8 13:33 +0100)
committerGitHub <noreply@github.com>
Tue, 8 Jan 2019 12:33:48 +0000 (8 13:33 +0100)
tree21db9c6de1c09de42ad4fcbad371d31d0fdc3659
parent364594cbf5d3d930d1bc332d8cced1f6579cf051
parent5bffa45db35f23990b7848f0122f60671e4e9afa
Merge branch 'master' into dont-use-sighup