Merge remote-tracking branch 'origin/master'
authorLiana Bakradze <liana.bakradze@jetbrains.com>
Tue, 21 Oct 2014 15:16:51 +0000 (19:16 +0400)
committerLiana Bakradze <liana.bakradze@jetbrains.com>
Tue, 21 Oct 2014 15:16:51 +0000 (19:16 +0400)

Trivial merge