Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Wed, 14 Jan 2015 16:16:01 +0000 (19:16 +0300)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Wed, 14 Jan 2015 16:16:01 +0000 (19:16 +0300)

Trivial merge