Merge remote-tracking branch 'origin/master'
authorLiana Bakradze <liana.bakradze@jetbrains.com>
Thu, 15 Jan 2015 14:47:52 +0000 (17:47 +0300)
committerLiana Bakradze <liana.bakradze@jetbrains.com>
Thu, 15 Jan 2015 14:47:52 +0000 (17:47 +0300)

Trivial merge