Waldemar Brodkorb 4882a074aa resolve merge conflict %!s(int64=13) %!d(string=hai) anos
..
patches 4882a074aa resolve merge conflict %!s(int64=13) %!d(string=hai) anos
Makefile 2f4bfa7dc8 update to latest upstream version %!s(int64=13) %!d(string=hai) anos