Merge branch origin/master
authorElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Wed, 17 Dec 2014 15:35:22 +0000 (18:35 +0300)
committerElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Wed, 17 Dec 2014 15:35:22 +0000 (18:35 +0300)
commit4c34fa744013a616b483881c6b4dd43c8bfccb4a
tree083c0d99599dcf77a6aa6011b06abb92a8298de0
parent6b7eeefb19731cfee3a8b78a7e8a5a10afbcbafe
parent0ed8aa5d22601b7f8cca38e18cba6f6c636dda01
Merge branch origin/master