Merge branch 'svn_18_3'
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Tue, 16 Sep 2014 15:32:19 +0000 (19:32 +0400)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Tue, 16 Sep 2014 15:32:19 +0000 (19:32 +0400)
commit146077cafb94c85b6493a16557b3c1360705a779
treec14de3059ec4b256d4ff4532c504c30f93319cce
parent502390960b30c952454f6ecaf69ed95cf02411ad
parent7fedaf8348edfbb395d40de720e00cac8a804ea0
Merge branch 'svn_18_3'