Merge branch 'master' of https://github.com/civicrm/civicrm-core into CRM-17745
authorJKingsnorth <john@johnkingsnorth.co.uk>
Mon, 4 Jan 2016 13:34:59 +0000 (13:34 +0000)
committerJKingsnorth <john@johnkingsnorth.co.uk>
Mon, 4 Jan 2016 13:34:59 +0000 (13:34 +0000)
commit1272c5babe8959a8971cd950d5f3784f9a988e02
tree15b7d8cdfcc43a0fda0b0169b08583b620627bb3
parent982e99a9ca4abe25ae6fd56e5be47f6a0cf10f9f
parent05a5b2cf3ff09660a5f97bf36632af69127ec08d
Merge branch 'master' of https://github.com/civicrm/civicrm-core into CRM-17745
xml/schema/Event/Event.xml