Merge remote-tracking branch 'origin/master' into IDEA-CR-10038
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Fri, 29 Apr 2016 10:54:16 +0000 (12:54 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Fri, 29 Apr 2016 10:54:16 +0000 (12:54 +0200)
commit36a9747f52833983296a67439691b9a2e8278036
treef1e2156a70cbcdc86d9d1fb8c4379a8dccde362a
parenta3fa84929166b00965bc5a3b9c7059b9d59a83c6
parent9168c65deac7cd2698fe866aeb9afcfdbe5983f2
Merge remote-tracking branch 'origin/master' into IDEA-CR-10038
platform/built-in-server/src/org/jetbrains/ide/RestService.java
platform/platform-impl/src/com/intellij/util/Urls.java