Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Mon, 8 Sep 2014 10:39:37 +0000 (14:39 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Mon, 8 Sep 2014 10:39:37 +0000 (14:39 +0400)
commitfa8f537d59528f91edd81387759e9ba75b4cfb5a
tree53c0d5b33322c06bc93e2e60a7348aa87a489848
parentc2d0ad319c3539e76347f67b9daecda5b942f80c
parentf13682a2e714bf58e3090d2494da7fbace879a12
Merge remote-tracking branch 'origin/master'
python/edu/learn-python/resources/META-INF/plugin.xml