Merge remote-tracking branch 'origin/master' clion/144.2988 pycharm/144.2992
authorAlexey Utkin <alexey.utkin@jetbrains.com>
Wed, 13 Jan 2016 06:47:46 +0000 (09:47 +0300)
committerAlexey Utkin <alexey.utkin@jetbrains.com>
Wed, 13 Jan 2016 06:47:46 +0000 (09:47 +0300)

Trivial merge