Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Wed, 16 Oct 2013 11:59:19 +0000 (13:59 +0200)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Wed, 16 Oct 2013 11:59:19 +0000 (13:59 +0200)

Trivial merge