Merge remote-tracking branch 'origin/master' idea/140.161
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Fri, 17 Oct 2014 15:27:01 +0000 (19:27 +0400)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Fri, 17 Oct 2014 15:27:01 +0000 (19:27 +0400)

Trivial merge