Waldemar Brodkorb f14c1fc551 resolve merge conflict %!s(int64=11) %!d(string=hai) anos
..
files ba3359722c optimize ipkg package management %!s(int64=16) %!d(string=hai) anos
patches bb9efd2683 update firefox and dependencies %!s(int64=11) %!d(string=hai) anos
Makefile f14c1fc551 resolve merge conflict %!s(int64=11) %!d(string=hai) anos