Merge remote-tracking branch 'origin/master'
authorAlexander Lobas <Alexander.Lobas@jetbrains.com>
Wed, 25 Jan 2012 14:44:12 +0000 (18:44 +0400)
committerAlexander Lobas <Alexander.Lobas@jetbrains.com>
Wed, 25 Jan 2012 14:44:12 +0000 (18:44 +0400)

Trivial merge