Merge remote-tracking branch 'origin/master'
authorLiana Bakradze <liana.bakradze@jetbrains.com>
Mon, 20 Oct 2014 10:28:32 +0000 (14:28 +0400)
committerLiana Bakradze <liana.bakradze@jetbrains.com>
Mon, 20 Oct 2014 10:28:32 +0000 (14:28 +0400)

Trivial merge