Merge branch 'CRM-15714' of https://github.com/adixon/civicrm-core into adixon-CRM...
authorDave Greenberg <dave@civicrm.org>
Wed, 4 Feb 2015 20:38:51 +0000 (12:38 -0800)
committerDave Greenberg <dave@civicrm.org>
Wed, 4 Feb 2015 20:38:51 +0000 (12:38 -0800)
commitdf0d084d2f97bf12a241e1e23809802e4ac8f5ed
treee4e0b91baccc9e97bc39d29780bbab7f172108a9
parentf7e8909f1b775277788bcb39d700f059d40be7f3
parentd1bd65af41d93e47b58669190668cc6f514745c7
Merge branch 'CRM-15714' of https://github.com/adixon/civicrm-core into adixon-CRM-15714

Conflicts:
CRM/Core/Payment.php

----------------------------------------
* CRM-15714: validateCreditCard function makes too many assumptions
  https://issues.civicrm.org/jira/browse/CRM-15714
CRM/Contribute/Form/Contribution/Main.php
CRM/Contribute/Form/UpdateBilling.php
CRM/Core/Payment.php
CRM/Core/Payment/Form.php
CRM/Event/Form/Participant.php
CRM/Event/Form/Registration/AdditionalParticipant.php
CRM/Event/Form/Registration/Register.php
CRM/Member/Form/Membership.php