Merge branch origin/master
authorElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Mon, 17 Nov 2014 18:18:24 +0000 (21:18 +0300)
committerElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Mon, 17 Nov 2014 18:18:24 +0000 (21:18 +0300)
commit23bfa7a5c7f06913acc6b3c9cea046267451c5f4
tree53dd402a829ebef3a7a842d91706e7e4eea82163
parent0fac3a17ff60085daaee9bfc18a5d7c2440bb206
parenta8eb18ba5ad4999db0c7ddba185ad16d59de9563
Merge branch origin/master