Merge remote-tracking branch 'origin/master'
authorAlexander Zolotov <Alexander.Zolotov@jetbrains.com>
Thu, 16 May 2013 09:51:59 +0000 (13:51 +0400)
committerAlexander Zolotov <Alexander.Zolotov@jetbrains.com>
Thu, 16 May 2013 09:51:59 +0000 (13:51 +0400)

Trivial merge