Merge remote-tracking branch 'origin/master' clion/162.4
authorVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Fri, 6 May 2016 10:26:38 +0000 (13:26 +0300)
committerVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Fri, 6 May 2016 10:26:38 +0000 (13:26 +0300)
commit5f3fd5ca427356cbdb16dcdbcecccd500358c9ea
treedc69afc4b7cb902eed9aa3d2e5d87be8d4580dea
parenta5317609ce554345da1e4cc33882eeae1a9e5f5a
parentd53e968b86fd0ac33ffe33c0cd587b00a06d6876
Merge remote-tracking branch 'origin/master'