Merge branch 'origin/master'
authorElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Fri, 16 Jan 2015 11:01:23 +0000 (14:01 +0300)
committerElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Fri, 16 Jan 2015 11:01:23 +0000 (14:01 +0300)
commit1c21061f90c03f983e34af2dc3273bc1adbc678b
tree550ca851be8ac0136c05ca895375e8a85c2ff547
parent54d8cf3a4c59975e5a2ed3c87a7854b86b244e61
parent3c5619b569e0f1b6ea00a4d7c11a42f372123f2b
Merge branch 'origin/master'