Merge branch origin/master
authorElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Wed, 3 Dec 2014 14:27:43 +0000 (17:27 +0300)
committerElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Wed, 3 Dec 2014 14:27:43 +0000 (17:27 +0300)
commitd12fceb11304b2ab5f5fd5eeabfba49c3821484e
treee02a6adcefa381fa0ad8c9b8add4622eed86f0e6
parentd87d75a412013c54d6bf3855078f0272518f17eb
parenta25c179dd184a67123ef573b0a0ae31a01e33d4f
Merge branch origin/master