Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Fri, 22 Nov 2013 08:44:21 +0000 (12:44 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Fri, 22 Nov 2013 08:44:21 +0000 (12:44 +0400)

Trivial merge