Merge branch origin/master
authorElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Wed, 3 Dec 2014 17:43:01 +0000 (20:43 +0300)
committerElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Wed, 3 Dec 2014 17:43:01 +0000 (20:43 +0300)
commit7640bf5d9eb569651bee60289a8887f0bab3076e
treefb55b1d78820b729e82289f6e08c66045db571e0
parent381ef3565f3e30dab2179966cc503b9202c09312
parent92828e12325beabe3e99f815781a338049459bdf
Merge branch origin/master