Merge remote-tracking branch 'origin/master'
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Tue, 13 Jan 2015 11:54:37 +0000 (14:54 +0300)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Tue, 13 Jan 2015 11:54:37 +0000 (14:54 +0300)

Trivial merge