tree 2f658698beab1136e5dacf0a80a51c9492976db6
parent 5be35902e3f07e6603e22fbfa3e277db92a764b6
author Vasili Gulevich <vasili.gulevich@xored.com> 1531755445 +0700
committer Vasili Gulevich <vasili.gulevich@xored.com> 1531755445 +0700

Fixed merge-induced compilation errors