Merge remote-tracking branch 'origin/master'
authorLiana Bakradze <liana.bakradze@jetbrains.com>
Wed, 29 Oct 2014 16:22:08 +0000 (19:22 +0300)
committerLiana Bakradze <liana.bakradze@jetbrains.com>
Wed, 29 Oct 2014 16:22:08 +0000 (19:22 +0300)

Trivial merge