Merge remote-tracking branch 'origin/master'
authorLiana Bakradze <liana.bakradze@jetbrains.com>
Tue, 9 Dec 2014 14:32:04 +0000 (17:32 +0300)
committerLiana Bakradze <liana.bakradze@jetbrains.com>
Tue, 9 Dec 2014 14:32:04 +0000 (17:32 +0300)

Trivial merge