Merge branch 'svn_18_2'
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Wed, 13 Nov 2013 16:11:17 +0000 (20:11 +0400)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Wed, 13 Nov 2013 16:11:17 +0000 (20:11 +0400)

Trivial merge