Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Tue, 19 Feb 2013 11:43:53 +0000 (15:43 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Tue, 19 Feb 2013 11:43:53 +0000 (15:43 +0400)

Trivial merge