Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Mon, 3 Mar 2014 14:43:21 +0000 (18:43 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Mon, 3 Mar 2014 14:43:21 +0000 (18:43 +0400)

Trivial merge