Merge remote-tracking branch 'origin/master' idea/134.1153
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Mon, 17 Feb 2014 11:37:29 +0000 (15:37 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Mon, 17 Feb 2014 11:37:29 +0000 (15:37 +0400)

Trivial merge