Merge remote-tracking branch 'origin/master'
authorKonstantin Bulenkov <kb@jetbrains.com>
Thu, 4 Dec 2014 10:27:59 +0000 (13:27 +0300)
committerKonstantin Bulenkov <kb@jetbrains.com>
Thu, 4 Dec 2014 10:27:59 +0000 (13:27 +0300)

Trivial merge