joomla/joomla-cms — pull request #7 by elkuku (2011-10-14 19:03:49+00:00)
Title: Patchtest: Add a conflict

This **should** conflict with Add a line