Merge remote-tracking branch 'origin/master'
authorKonstantin Bulenkov <kb@jetbrains.com>
Mon, 25 Jul 2016 13:20:43 +0000 (15:20 +0200)
committerKonstantin Bulenkov <kb@jetbrains.com>
Mon, 25 Jul 2016 13:20:43 +0000 (15:20 +0200)
commitcda2a6f0337360740a28eda2b1e972578299e255
tree5478ab0ff0b97a35aad50a6a936e4fb04eb4a570
parent5df6e37bbefc6fcc9985b452e070715e11b7b531
parent4bc9c405980b0e50b604124f5ff3e301ac17ea25
Merge remote-tracking branch 'origin/master'
platform/util/resources/misc/registry.properties