Merge remote-tracking branch 'origin/master'
authorKonstantin Bulenkov <kb@jetbrains.com>
Thu, 4 Feb 2016 13:30:36 +0000 (14:30 +0100)
committerKonstantin Bulenkov <kb@jetbrains.com>
Thu, 4 Feb 2016 13:30:36 +0000 (14:30 +0100)

Trivial merge