Merge remote-tracking branch 'origin/master'
authorAnna Kozlova <anna.kozlova@jetbrains.com>
Mon, 13 Oct 2014 17:45:04 +0000 (19:45 +0200)
committerAnna Kozlova <anna.kozlova@jetbrains.com>
Mon, 13 Oct 2014 17:45:04 +0000 (19:45 +0200)
commitd48970af2562ad091d3e9f946c928fd18b5f0f32
tree9ee0d991ffe74a6f135b6c292a54387e70763b27
parentb2ea4c6e79f51490ea3f20d81d163f8d614acf68
parentd8170fa498d3abd566d67fd5beb8a4ce80155deb
Merge remote-tracking branch 'origin/master'