Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Mon, 21 Apr 2014 12:14:09 +0000 (16:14 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Mon, 21 Apr 2014 12:14:09 +0000 (16:14 +0400)

Trivial merge