Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Wed, 20 Nov 2013 12:29:20 +0000 (16:29 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Wed, 20 Nov 2013 12:29:20 +0000 (16:29 +0400)

Trivial merge