Merge branch 'origin/master'
authorElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Wed, 4 Feb 2015 12:42:20 +0000 (15:42 +0300)
committerElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Wed, 4 Feb 2015 12:42:20 +0000 (15:42 +0300)
commit853f6c30133a1ee98616f1a358f84158deb45fe8
tree447e322dd49f0b85f2bfa98c9411af36ddea1d83
parent0f4a0842c648e5793c78b1a7693c16e9d21ca635
parent1a465304030fcd5071c127632f15bd078b2df9ab
Merge branch 'origin/master'