civicrm/civicrm-core — pull request #3552 by eileenmcnaughton (2014-06-23 23:37:39+00:00)
Title: 4.4 merge

@davecivicrm So, after this merge it no longer tries to merge the xml changes in - I did get a merge conflict & reset the xml file & now it accepts that change as 'unwelcome'