joomla-projects/joomla-cms — pull request #60 by Buddhima (2013-07-09 15:14:39+00:00)
Title: Project com_services - conflict resolve

PR to remove conflicts in com_services branch and apply latest changes