Merge remote-tracking branch 'origin/master' idea/120.274
authorMaxim.Mossienko <Maxim.Mossienko@jetbrains.com>
Mon, 30 Jul 2012 07:54:21 +0000 (11:54 +0400)
committerMaxim.Mossienko <Maxim.Mossienko@jetbrains.com>
Mon, 30 Jul 2012 07:54:21 +0000 (11:54 +0400)

Trivial merge