From: Dave Greenberg <dave@civicrm.org>
Date: Wed, 4 Feb 2015 20:38:51 +0000 (-0800)
Subject: Merge branch 'CRM-15714' of https://github.com/adixon/civicrm-core into adixon-CRM... 
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=df0d084d2f97bf12a241e1e23809802e4ac8f5ed;p=civicrm-core.git

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
---

df0d084d2f97bf12a241e1e23809802e4ac8f5ed