Merge remote-tracking branch 'origin/master'
authorLiana Bakradze <liana.bakradze@jetbrains.com>
Tue, 28 Oct 2014 11:05:13 +0000 (14:05 +0300)
committerLiana Bakradze <liana.bakradze@jetbrains.com>
Tue, 28 Oct 2014 11:05:13 +0000 (14:05 +0300)

Trivial merge