Merge branch 'svn_18_3' appcode/138.1675 clion/138.1676 dbe/138.1678 idea/138.1679 phpstorm/138.1677 phpstorm/138.1682 pycharm/138.1681 rubymine/138.1680 webstorm/138.1673
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Sat, 16 Aug 2014 20:59:33 +0000 (00:59 +0400)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Sat, 16 Aug 2014 20:59:33 +0000 (00:59 +0400)

Trivial merge