Waldemar Brodkorb f14c1fc551 resolve merge conflict %!s(int64=10) %!d(string=hai) anos
..
files 85253eabaf update to latest upstream version %!s(int64=12) %!d(string=hai) anos
patches e45bc457ab fix release build for uClibc raspberry-pi %!s(int64=11) %!d(string=hai) anos
Makefile f14c1fc551 resolve merge conflict %!s(int64=10) %!d(string=hai) anos