Merge remote-tracking branch 'origin/master' into IDEA-CR-10038
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Thu, 12 May 2016 09:28:40 +0000 (11:28 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Thu, 12 May 2016 09:28:40 +0000 (11:28 +0200)
commite79931456abe2b9a5072a5958191c0561b4c7f8c
tree06a0c5b555d6feb562fc3e6fc57e1e57ea006cd2
parent74586357bc8a880579432f154a9cc57c0e1004ba
parent29fbf912470ff03b8f50454248591c2c0cbcdc39
Merge remote-tracking branch 'origin/master' into IDEA-CR-10038
platform/util/resources/misc/registry.properties