Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Mon, 18 Nov 2013 13:34:05 +0000 (17:34 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Mon, 18 Nov 2013 13:34:05 +0000 (17:34 +0400)

Trivial merge