Merge remote-tracking branch 'origin/master'
authorKirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Tue, 31 Jan 2012 12:29:50 +0000 (16:29 +0400)
committerKirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Tue, 31 Jan 2012 12:29:50 +0000 (16:29 +0400)

Trivial merge