Waldemar Brodkorb 58d3189605 resolve merge conflicts %!s(int64=14) %!d(string=hai) anos
..
patches 219a6dab89 Initial import %!s(int64=15) %!d(string=hai) anos
Makefile 58d3189605 resolve merge conflicts %!s(int64=14) %!d(string=hai) anos