Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Wed, 27 Nov 2013 13:43:01 +0000 (17:43 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Wed, 27 Nov 2013 13:43:01 +0000 (17:43 +0400)

Trivial merge