Merge remote-tracking branch 'origin/master'
authorLiana Bakradze <liana.bakradze@jetbrains.com>
Mon, 24 Nov 2014 12:54:25 +0000 (15:54 +0300)
committerLiana Bakradze <liana.bakradze@jetbrains.com>
Mon, 24 Nov 2014 12:54:25 +0000 (15:54 +0300)

Trivial merge