Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 21 Apr 2015 10:35:20 +0000 (12:35 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 21 Apr 2015 10:35:20 +0000 (12:35 +0200)
commit759284d4ec09f937adb79b8466755243bfe8307b
treec64c43a7f4b0ea7144f5798600de1d6eedd392f7
parent909528215b3034f63c4ff883e88b3b2c6d542df3
parent6dfac8f29a3460863e60bd72b3f309ecdb081f3d
Merge remote-tracking branch 'origin/master'
platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java