Merge branch origin/master
authorElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Thu, 15 Jan 2015 15:44:15 +0000 (18:44 +0300)
committerElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Thu, 15 Jan 2015 15:44:15 +0000 (18:44 +0300)
commit069859f4df97609c733f7a3db33e453185fa5c07
treee5fecd94879eaaf9b5f72aa20feeab7641edfcb8
parent5c265c37c5cddd1901e07b09bb87b78a834d7ff8
parent3da5494bb9c170691f8601a302e612554b3e5b0c
Merge branch origin/master