wbx 933e74c072 resolve merge conflict 15 lat temu
..
2.6.36 46b2bb3001 Merge branch 'master' of git+ssh://openadk.org/git/openadk 15 lat temu
2.6.37 933e74c072 resolve merge conflict 15 lat temu