Merge branch 4.5 into master
authorColeman Watts <coleman@civicrm.org>
Tue, 3 Feb 2015 13:50:35 +0000 (08:50 -0500)
committerColeman Watts <coleman@civicrm.org>
Tue, 3 Feb 2015 13:52:10 +0000 (08:52 -0500)
commit1e66775e6f88ac33d643ca2d68577ab01dd41dd5
tree573744610de8d8f87d186a2dba7be3c64c5d56a4
parent493c757190d33b6818048dae6053d22ef153acc9
parent7f72075feb10a4992c096fc885fe801a0dfe174b
Merge branch 4.5 into master

Conflicts:
CRM/Core/BAO/CustomValueTable.php
CRM/Core/BAO/CustomField.php
CRM/Core/BAO/CustomValueTable.php
CRM/Core/Invoke.php
CRM/Pledge/Form/Payment.php
templates/CRM/Pledge/Form/Payment.tpl