Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 3 Mar 2015 12:30:18 +0000 (13:30 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 3 Mar 2015 12:30:18 +0000 (13:30 +0100)
commitf6d715a3a45847c1ef036e09324d13c7b2fdf33b
tree53d9341890a3d9b2622dc9f1dcc02fb0b83ccd42
parent600965328681c7ffc550ab904b1df97af9b7e717
parent49372cdf9bbf76529e3126ed55a4b4c2603b0c4a
Merge remote-tracking branch 'origin/master'
platform/util/resources/misc/registry.properties