Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 13 May 2014 13:51:08 +0000 (15:51 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 13 May 2014 13:51:08 +0000 (15:51 +0200)
commit174a488ce1c98492e93f5d7942913bf93d199ecf
treed930b4f7234d9a8ad4194e59aee8be853b6468da
parent6a0d559993a04c2efe79262adaeb68f8e8babe3e
parent0f964dada0a88faeac1b93bde703a75662aaebef
Merge branch 'master' of git.labs.intellij.net:idea/community