Merge remote-tracking branch 'origin/master'
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Mon, 13 Oct 2014 18:12:44 +0000 (22:12 +0400)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Mon, 13 Oct 2014 18:12:44 +0000 (22:12 +0400)

Trivial merge