Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Wed, 30 Apr 2014 10:15:28 +0000 (14:15 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Wed, 30 Apr 2014 10:15:28 +0000 (14:15 +0400)

Trivial merge