Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Thu, 9 Jan 2014 11:30:47 +0000 (15:30 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Thu, 9 Jan 2014 11:30:47 +0000 (15:30 +0400)

Trivial merge