Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Mon, 12 May 2014 11:40:29 +0000 (15:40 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Mon, 12 May 2014 11:40:29 +0000 (15:40 +0400)

Trivial merge