Merge branch 'svn_18_3'
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Mon, 13 Oct 2014 20:40:57 +0000 (00:40 +0400)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Mon, 13 Oct 2014 20:40:57 +0000 (00:40 +0400)

Trivial merge