Merge remote-tracking branch 'origin/master'
authorDennis Ushakov <dennis.ushakov@gmail.com>
Thu, 25 Jan 2018 12:02:20 +0000 (15:02 +0300)
committerDennis Ushakov <dennis.ushakov@gmail.com>
Thu, 25 Jan 2018 12:02:20 +0000 (15:02 +0300)
1  2 
platform/util/resources/misc/registry.properties
python/src/META-INF/python-core-common.xml