Merge remote-tracking branch 'origin/master'
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Wed, 21 Jan 2015 11:06:08 +0000 (12:06 +0100)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Wed, 21 Jan 2015 11:06:08 +0000 (12:06 +0100)
commitaa630c046a14f2848f6d8376534a99608fa7305d
tree6a52d61b56232e43797153062d8846c4fff8f2e1
parent7214362c30562ea66f649f043dd99220a47e96e5
parent1ea9140cba71d3fed14fb0be96c397e151934aab
Merge remote-tracking branch 'origin/master'