Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Fri, 18 Oct 2013 08:24:44 +0000 (10:24 +0200)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Fri, 18 Oct 2013 08:24:44 +0000 (10:24 +0200)

Trivial merge