d1582c0d578861e00a241920f4a5790ba868a2ac d559af649983797edee9e0506ad7bce707e5ce82 Igor Vinogradov <igor.vinogradov.82@gmail.com> 1551446390 +0200	commit: Merge branch 'master' of G:\Development\Work\SWDFactory\pvstream_pilot with conflicts.
d559af649983797edee9e0506ad7bce707e5ce82 5beb9d1bc10a5eb4c6f15b9b8dd04359cb904d3d Igor Vinogradov <igor.vinogradov.82@gmail.com> 1551446511 +0200	commit (merge): Merge remote-tracking branch 'origin/master'
5beb9d1bc10a5eb4c6f15b9b8dd04359cb904d3d ed96dde688e24fcc8bbb57d0841f32281604f250 Igor Vinogradov <igor.vinogradov.82@gmail.com> 1552342658 +0200	merge origin/master: Merge made by the 'recursive' strategy.