Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Tue, 10 Dec 2013 17:03:30 +0000 (21:03 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Tue, 10 Dec 2013 17:03:30 +0000 (21:03 +0400)

Trivial merge