Waldemar Brodkorb f14c1fc551 resolve merge conflict %!s(int64=10) %!d(string=hai) anos
..
patches 9ff776e734 update to latest upstream version %!s(int64=13) %!d(string=hai) anos
Makefile f14c1fc551 resolve merge conflict %!s(int64=10) %!d(string=hai) anos