Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Thu, 24 Oct 2013 11:44:34 +0000 (15:44 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Thu, 24 Oct 2013 11:44:34 +0000 (15:44 +0400)

Trivial merge