Merge remote-tracking branch 'origin/master'
authorirengrig <Irina.Chernushina@jetbrains.com>
Mon, 31 Aug 2015 17:31:21 +0000 (19:31 +0200)
committerirengrig <Irina.Chernushina@jetbrains.com>
Mon, 31 Aug 2015 17:31:21 +0000 (19:31 +0200)

Trivial merge