Merge branch origin/master
authorElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Wed, 29 Oct 2014 17:05:15 +0000 (20:05 +0300)
committerElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Wed, 29 Oct 2014 17:05:15 +0000 (20:05 +0300)
commit08769a50297891dc91eafe20a222728b535974b1
tree9589cc5f2bd3f2cfebead25fe5037d4175ed4bec
parentafe9b5c0562ae5e8ae167389dac8555a2182af07
parentaaf6edac79f55817c058e88de92702e9aacccc2c
Merge branch origin/master