Merge remote-tracking branch 'origin/master'
authorirengrig <Irina.Chernushina@jetbrains.com>
Wed, 21 Oct 2015 12:49:07 +0000 (14:49 +0200)
committerirengrig <Irina.Chernushina@jetbrains.com>
Wed, 21 Oct 2015 12:49:07 +0000 (14:49 +0200)
commit3dc30ee461649aeb0cb02d6be3501c9557f62653
tree8193713a7f769abc5edf5f0a8f2c39350ec81138
parentfa5e8606177038ab98ed800a20a537aae93d4f3c
parent9d13d0a53bf21227a166640c6a4a3b4722136920
Merge remote-tracking branch 'origin/master'