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)
commit7270e1a5c625b133b51cecb6e6b9fbe38e3ed737
treeb03963ac4bc4193d0ed156d08ac692dfe9567e44
parent7524a66754c623042348ede0efc14205a8df1d07
parent862497d320ebf32046f5c46b3d9ff23a1a5ab957
Merge remote-tracking branch 'origin/master' into IDEA-CR-10038
platform/util/resources/misc/registry.properties