Merge remote-tracking branch 'origin/master'
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Tue, 23 Dec 2014 18:16:07 +0000 (21:16 +0300)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Tue, 23 Dec 2014 18:16:07 +0000 (21:16 +0300)

Trivial merge