Merge pull request #6450 from civicrm/4.6
authorEileen McNaughton <eileen@mcnaughty.com>
Mon, 10 Aug 2015 01:07:22 +0000 (13:07 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Mon, 10 Aug 2015 01:07:22 +0000 (13:07 +1200)
commit1efc0ed2fd6742f53e6d7b180021e71818d131c9
treed17c0588aa71739ebb56146c6d89592780b471f1
parente04afcb4ddc8a463d969d19082b58aece6f5ed71
parent56fa9d4e19cbb6d88c5b2c380f0a37160bc381fe
Merge pull request #6450 from civicrm/4.6

Merge 4.6 to master
CRM/Admin/Form/ParticipantStatusType.php
CRM/Core/BAO/CustomField.php
CRM/Core/BAO/Mapping.php