Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Thu, 31 Oct 2013 08:58:22 +0000 (12:58 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Thu, 31 Oct 2013 08:58:22 +0000 (12:58 +0400)

Trivial merge