Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 19 Apr 2016 15:29:23 +0000 (17:29 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 19 Apr 2016 15:29:23 +0000 (17:29 +0200)
commitd821d84267705c3e27b3689bc5995a354d05550f
treea06d987896bf2ea789d70edd4bf3488a662a0ad9
parent965665df92c30ae4840b9dcd9e2a47512a371cf1
parent074a410293add5f510e081b1904bb175f79f22b2
Merge remote-tracking branch 'origin/master'