Merge branch 'origin/master' appcode/140.1864 clion/140.1863
authorElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Wed, 21 Jan 2015 16:36:01 +0000 (19:36 +0300)
committerElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Wed, 21 Jan 2015 16:36:01 +0000 (19:36 +0300)
commitd8129a22717e13b8470e20e569c71a82e60ef345
treebfea572c2ed5be465cba954dcc7f477217777f60
parente9bf0844e983cb733dd3e384491f05deaa897e92
parent19458eb3b60d30fdd1f21bfd5db47bf30d22c394
Merge branch 'origin/master'