Merge remote-tracking branch 'origin/master'
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Fri, 24 Apr 2015 18:58:09 +0000 (21:58 +0300)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Fri, 24 Apr 2015 18:58:09 +0000 (21:58 +0300)

Trivial merge