Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Fri, 17 Jan 2014 08:27:12 +0000 (12:27 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Fri, 17 Jan 2014 08:27:12 +0000 (12:27 +0400)

Trivial merge