Merge branch 'traff/terminal-urls'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 19 Jan 2017 15:59:36 +0000 (16:59 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 19 Jan 2017 15:59:36 +0000 (16:59 +0100)

Trivial merge