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

Trivial merge