Merge remote-tracking branch 'origin/master'
authorKonstantin Bulenkov <kb@jetbrains.com>
Fri, 5 Sep 2014 23:26:44 +0000 (03:26 +0400)
committerKonstantin Bulenkov <kb@jetbrains.com>
Fri, 5 Sep 2014 23:26:44 +0000 (03:26 +0400)

Trivial merge