Merge remote-tracking branch 'origin/master'
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Tue, 7 Oct 2014 19:40:41 +0000 (23:40 +0400)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Tue, 7 Oct 2014 19:40:41 +0000 (23:40 +0400)

Trivial merge