Merge remote branch 'origin/master'
authorirengrig <Irina.Chernushina@jetbrains.com>
Thu, 31 Jan 2013 08:38:37 +0000 (12:38 +0400)
committerirengrig <Irina.Chernushina@jetbrains.com>
Thu, 31 Jan 2013 08:38:37 +0000 (12:38 +0400)
commit7720c64922997ca00c986b09777a87fa2ec73a70
tree1dbd66509e409a6d59151e3fe41d824d162a993f
parent9346f0f29f297c47f907b6c921faae71245119e2
parentea7e6698bd8c0193ac815971b02448d0d222f2f2
Merge remote branch 'origin/master'
platform/platform-resources/src/META-INF/PlatformExtensions.xml