Merge remote-tracking branch 'origin/master'
authorLiana Bakradze <liana.bakradze@jetbrains.com>
Mon, 22 Sep 2014 15:51:37 +0000 (19:51 +0400)
committerLiana Bakradze <liana.bakradze@jetbrains.com>
Mon, 22 Sep 2014 15:51:37 +0000 (19:51 +0400)

Trivial merge