Merge branch 'JohnFF-patch-1'
authorColeman Watts <coleman@civicrm.org>
Mon, 11 Aug 2014 17:00:28 +0000 (18:00 +0100)
committerColeman Watts <coleman@civicrm.org>
Mon, 11 Aug 2014 17:00:28 +0000 (18:00 +0100)
commit9747cc7e7676edd433c3c76e476a0fd0bd74ea7e
tree6237c8577763a4d6bc49a065e01bacef0da66b62
parent5d51e53c12636f90cb6dada1274aafb98ffa1a45
parent0cca0bf43e5436c690899b32b013d1416cb73ba1
Merge branch 'JohnFF-patch-1'

Conflicts:
CRM/Event/BAO/Participant.php
CRM/Event/BAO/Participant.php