Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Wed, 15 Jan 2014 14:32:43 +0000 (18:32 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Wed, 15 Jan 2014 14:32:43 +0000 (18:32 +0400)

Trivial merge