Thu, 19 Mar 2020 15:20:28 +0100make main(), easier merge
Claudio Luck <claudio.luck@pep.foundation> [Thu, 19 Mar 2020 15:20:28 +0100] rev 64
make main(), easier merge