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)
commit515ee1ea5aed14ad26da34a72ffb58bad7416f07
treecca9e1939f5e108e1b351b0b8fab9818cfe57447
parenta20fde2cabfac7a92ef9b5efde1b35c5bd3c3375
parenta01d73ff0e5ef6ffa8e9a272cc60b57b65b51a25
Merge branch 'master' into uta-python