Merge remote-tracking branch 'origin/master'
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Wed, 2 Apr 2014 15:38:34 +0000 (19:38 +0400)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Wed, 2 Apr 2014 15:38:34 +0000 (19:38 +0400)

Trivial merge