Merge remote-tracking branch 'origin/master' pycharm/138.1543
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Sat, 9 Aug 2014 14:33:12 +0000 (18:33 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Sat, 9 Aug 2014 14:33:12 +0000 (18:33 +0400)

Trivial merge