Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Sat, 2 Nov 2013 08:42:06 +0000 (12:42 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Sat, 2 Nov 2013 08:42:06 +0000 (12:42 +0400)

Trivial merge