Merge remote-tracking branch 'origin/master'
authorLiana Bakradze <liana.bakradze@jetbrains.com>
Wed, 22 Oct 2014 11:15:31 +0000 (15:15 +0400)
committerLiana Bakradze <liana.bakradze@jetbrains.com>
Wed, 22 Oct 2014 11:15:31 +0000 (15:15 +0400)

Trivial merge