Merge remote-tracking branch 'origin/master'
authorLiana Bakradze <liana.bakradze@jetbrains.com>
Mon, 22 Sep 2014 16:33:12 +0000 (20:33 +0400)
committerLiana Bakradze <liana.bakradze@jetbrains.com>
Mon, 22 Sep 2014 16:33:12 +0000 (20:33 +0400)

Trivial merge