Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Tue, 12 Feb 2013 14:09:25 +0000 (18:09 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Tue, 12 Feb 2013 14:09:25 +0000 (18:09 +0400)

Trivial merge