Waldemar Brodkorb f14c1fc551 resolve merge conflict %!s(int64=12) %!d(string=hai) anos
..
patches d6561e7d59 update to latest upstream version %!s(int64=14) %!d(string=hai) anos
Makefile f14c1fc551 resolve merge conflict %!s(int64=12) %!d(string=hai) anos