\Merge branch 'master' of ../../IDEA3\r\r# Please enter a commit message to explain...
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 12 Aug 2014 16:39:01 +0000 (18:39 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 12 Aug 2014 16:39:01 +0000 (18:39 +0200)
commit93e946e6fe92bbfae1326a2a81e876488ffdf822
tree5c06ea9056e30c6fc5fc2361a220b5caa9dce2e1
parent586d99a0941575f7ee4a2cfd7b3afcae209e1969
parent45ba538674fff4aa5ebe516992d78e944d3d391d
\Merge branch 'master' of ../../IDEA3\r\r# Please enter a commit message to explain why this merge is necessary,\r# especially if it merges an updated upstream into a topic branch.\r#\r# Lines starting with '#' will be ignored, and an empty message aborts\r# the commit.