Merge branch 'patch-1' into WIZARDISHUNGRY-patch-1
authorPaul Brossier <piem@piem.org>
Tue, 6 Feb 2018 21:59:01 +0000 (22:59 +0100)
committerPaul Brossier <piem@piem.org>
Tue, 6 Feb 2018 21:59:01 +0000 (22:59 +0100)
commit5775f137dccf0f66c1683f089b04a5aedea73d1e
treef5a3878140b93e500fc2f0d5abb0c7deebb67119
parent25ecb7338cebc5b8c79092347839c78349ec33f1
parent43ce34c584f13da6583cc38e129b7f6b5d2c0b1d
Merge branch 'patch-1' into WIZARDISHUNGRY-patch-1