Merge branch 'matplotlib' to 'master'
authorElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Tue, 3 Feb 2015 10:06:34 +0000 (13:06 +0300)
committerElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Tue, 3 Feb 2015 10:06:34 +0000 (13:06 +0300)

Trivial merge