Merge branch origin/master
authorElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Fri, 19 Dec 2014 13:48:27 +0000 (16:48 +0300)
committerElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Fri, 19 Dec 2014 13:48:27 +0000 (16:48 +0300)
commit959badd293bfd2eb67709d6983b2c9fec7e8d1a2
tree137385887b95fcf89abe8f812d9fa43c95e18344
parent49402e927ead627dfb5c752dfeff870e56a97ad1
parent55ac3d026dce2603d9b6e3a6d3b7d8a21301d038
Merge branch origin/master