Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Mon, 25 Nov 2013 14:39:31 +0000 (18:39 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Mon, 25 Nov 2013 14:39:31 +0000 (18:39 +0400)

Trivial merge