Merge remote-tracking branch 'origin/master'
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Tue, 28 Oct 2014 19:55:33 +0000 (22:55 +0300)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Tue, 28 Oct 2014 19:55:33 +0000 (22:55 +0300)
commit3a28bb8f1a28c34daee9b6b11ce4177f99b99c09
treef9b949d97bb52b2cf0608e603600d9a0fa80ed5c
parent672c42cc8e33ad3ce04599570722821bdfac4dde
parent5d9196835e3f3eef81b38ba2bf39b9876ba49655
Merge remote-tracking branch 'origin/master'
platform/util/resources/misc/registry.properties