Merge remote-tracking branch 'origin/master'
authorLiana Bakradze <liana.bakradze@jetbrains.com>
Wed, 10 Sep 2014 12:02:31 +0000 (16:02 +0400)
committerLiana Bakradze <liana.bakradze@jetbrains.com>
Wed, 10 Sep 2014 12:02:31 +0000 (16:02 +0400)

Trivial merge