Merge remote-tracking branch 'origin/master'
authorLiana Bakradze <liana.bakradze@jetbrains.com>
Mon, 29 Sep 2014 13:57:11 +0000 (17:57 +0400)
committerLiana Bakradze <liana.bakradze@jetbrains.com>
Mon, 29 Sep 2014 13:57:11 +0000 (17:57 +0400)

Trivial merge