Merge remote-tracking branch 'origin/master'
authorirengrig <Irina.Chernushina@jetbrains.com>
Mon, 22 Dec 2014 08:04:49 +0000 (09:04 +0100)
committerirengrig <Irina.Chernushina@jetbrains.com>
Mon, 22 Dec 2014 08:04:49 +0000 (09:04 +0100)

Trivial merge