Merge branch 'origin/master'
authorElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Tue, 10 Feb 2015 12:55:49 +0000 (15:55 +0300)
committerElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Tue, 10 Feb 2015 12:55:49 +0000 (15:55 +0300)
commitfaeb7d1e92ad019f53d4c1131a59942636f6a466
treed91591689755ec755480ad14d39e9026b87d8e07
parentc3b333e727adfee66429b37b46bbdba4fe89f7bb
parent7fa7183527e31df82a5904e9ba02a00eb00fb3c4
Merge branch 'origin/master'