Merge remote-tracking branch 'origin/master'
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Fri, 7 Mar 2014 09:56:13 +0000 (13:56 +0400)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Fri, 7 Mar 2014 09:56:13 +0000 (13:56 +0400)
commit218756a176d826c80e6135dfa6fe8f522d6b36f3
tree54223a9754b707872f3db18f8f00082f4e652150
parentc49bd800cf74574c451880790195a9be4a2afe2c
parent3b799e4d8d92d6c6360978f30388ca1b1dfd8ab4
Merge remote-tracking branch 'origin/master'
platform/platform-resources-en/src/misc/registry.properties