Merge remote-tracking branch 'origin/master' into test2
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Thu, 27 Nov 2014 15:11:47 +0000 (18:11 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Thu, 27 Nov 2014 15:11:47 +0000 (18:11 +0300)
commit06248764472320a1a4a2399e74da96bbfa7b3697
tree4d833f19cf8602017f66b89398c419c9a196afce
parent1ada9745b0a27b06f91a8c8ea2968e927015cd1f
parent5b8b0f77ad9deca2adbdc6287f5c0ab15dfefc4b
Merge remote-tracking branch 'origin/master' into test2