magicant/pull-request — pull request #6 by magicant (2013-01-28 13:48:34+00:00)
Title: Add line Z in file4

In this pull request, the master branch is merged into the pull-requesting branch to resolve conflict.