Merge branch origin/master
authorElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Thu, 15 Jan 2015 17:52:31 +0000 (20:52 +0300)
committerElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Thu, 15 Jan 2015 17:52:31 +0000 (20:52 +0300)
commitb1ad49b7ce39fcd03eec4b2ccf7c03151fdbbadb
tree7cc0658f431c53e9905bf70c729b74080e49d216
parent61ff694d65a1108413229bd5c6e35ab564ee588f
parent7193d3339dd9ca2c15e3609a266102ac4d32377a
Merge branch origin/master