Merge remote-tracking branch 'origin/master' appcode/163.6051 clion/163.6050
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 10 Oct 2016 11:56:49 +0000 (13:56 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 10 Oct 2016 11:56:49 +0000 (13:56 +0200)

Trivial merge