Merge remote-tracking branch 'origin/master'
authorLiana Bakradze <liana.bakradze@jetbrains.com>
Tue, 16 Dec 2014 16:26:26 +0000 (19:26 +0300)
committerLiana Bakradze <liana.bakradze@jetbrains.com>
Tue, 16 Dec 2014 16:26:26 +0000 (19:26 +0300)

Trivial merge