Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Fri, 9 Jan 2015 20:11:09 +0000 (21:11 +0100)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Fri, 9 Jan 2015 20:11:09 +0000 (21:11 +0100)
commit2299ac0d861af499984f6711391e7a68f4e2116b
tree6ac47415726cadbe76c1e2cd1db04b9ea48ef346
parent50608e024d303f7349f693802f646a6735fb1f04
parent0ee564a95ef64ce74ea4d26084da9086198dbe68
Merge remote-tracking branch 'origin/master'
platform/platform-tests/testSrc/com/intellij/history/integration/IntegrationTestCase.java
resources/src/META-INF/IdeaPlugin.xml