Waldemar Brodkorb f14c1fc551 resolve merge conflict %!s(int64=12) %!d(string=hai) anos
..
patches a93dae2d59 readd needed patches %!s(int64=12) %!d(string=hai) anos
Makefile f14c1fc551 resolve merge conflict %!s(int64=12) %!d(string=hai) anos