Merge branch 'from-iad42-1'
authorAlexander Popov <alex.popov@linux.com>
Mon, 30 Jul 2018 20:02:24 +0000 (23:02 +0300)
committerAlexander Popov <alex.popov@linux.com>
Mon, 30 Jul 2018 20:02:24 +0000 (23:02 +0300)
commit39077d8196218060594a28a49ec497925ef5c371
treed9527b6e539babc81ecb0ec3dffbe5f31ff82a51
parentd5f427d59a4248454dd77698a85a47bc9b22e022
parenta54cd3b89b7208815e39076066cd6e2a1ee33956
Merge branch 'from-iad42-1'