Merge remote-tracking branch 'origin/master' pycharm/138.618
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Sun, 15 Jun 2014 15:25:39 +0000 (19:25 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Sun, 15 Jun 2014 15:25:39 +0000 (19:25 +0400)

Trivial merge