Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Tue, 13 May 2014 10:03:54 +0000 (14:03 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Tue, 13 May 2014 10:03:54 +0000 (14:03 +0400)

Trivial merge