Merge branch '4.5' into master
authorColeman Watts <coleman@civicrm.org>
Wed, 14 Jan 2015 02:51:08 +0000 (21:51 -0500)
committerColeman Watts <coleman@civicrm.org>
Wed, 14 Jan 2015 02:51:08 +0000 (21:51 -0500)
commit29d98e1314e345f1b9044f5359c2d0a67f380d21
treeb5e8cc90270a1618d62e13683135e95475c8e917
parent736628165c6eed87238173aa620b511f94db3cda
parent7b8d1e63a7914120975887eaa324302e6ad11f36
Merge branch '4.5' into master

Conflicts:
CRM/Core/Payment/BaseIPN.php
tests/phpunit/WebTest/Campaign/CampaignDescriptionTest.php
tests/phpunit/WebTest/Event/AddPricesetTest.php
tests/phpunit/WebTest/Member/OfflineMembershipRenewTest.php
CRM/Core/Payment/BaseIPN.php
tests/phpunit/WebTest/Case/CaseCustomFieldsTest.php
tests/phpunit/WebTest/Event/AddPricesetTest.php
tests/phpunit/WebTest/Event/MultiprofileEventTest.php
tests/phpunit/WebTest/Member/OfflineMembershipRenewTest.php
tests/phpunit/WebTest/Report/LoggingReportTest.php