Merge remote-tracking branch 'origin/master' into IDEA-CR-10038
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Thu, 28 Apr 2016 10:06:54 +0000 (12:06 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Thu, 28 Apr 2016 10:06:54 +0000 (12:06 +0200)
1  2 
platform/util/resources/misc/registry.properties