Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Tue, 3 Dec 2013 15:24:39 +0000 (19:24 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Tue, 3 Dec 2013 15:24:39 +0000 (19:24 +0400)

Trivial merge