Merge pull request #2350 from eileenmcnaughton/CRM-14012
[civicrm-core.git] / CRM / Event / Cart / BAO / Conference.php
2013-03-01 Tim OttenImport from SVN (r45945, r596)