Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Thu, 12 Dec 2013 12:43:50 +0000 (16:43 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Thu, 12 Dec 2013 12:43:50 +0000 (16:43 +0400)

Trivial merge