Merge branch 'master' into uta-python
authorAlexey Utkin <alexey.utkin@jetbrains.com>
Fri, 25 Dec 2015 14:36:19 +0000 (17:36 +0300)
committerAlexey Utkin <alexey.utkin@jetbrains.com>
Fri, 25 Dec 2015 14:36:19 +0000 (17:36 +0300)

Trivial merge