Merge branch 'ancorcruz-master'
authorPaul Brossier <piem@piem.org>
Thu, 21 Jun 2018 00:48:08 +0000 (02:48 +0200)
committerPaul Brossier <piem@piem.org>
Thu, 21 Jun 2018 00:48:08 +0000 (02:48 +0200)
commit5b1cbbcfa9ce3ea302d40a630f09c95389c0276b
tree02c9d701a3db4f5e5ff2c4a1132f780d59ca5fc5
parent967e4041f21d7eec9db319db98a37489aa19460c
parent1929be4c880ca872dd79f0d8dfa77145721d1b52
Merge branch 'ancorcruz-master'