Merge pull request #9601 from civicrm/4.7.15-rc

author Tim Otten <totten@civicrm.org>

Wed, 4 Jan 2017 20:07:16 +0000 (12:07 -0800)

committer GitHub <noreply@github.com>

Wed, 4 Jan 2017 20:07:16 +0000 (12:07 -0800)
author Tim Otten <totten@civicrm.org>
Wed, 4 Jan 2017 20:07:16 +0000 (12:07 -0800)
committer GitHub <noreply@github.com>
Wed, 4 Jan 2017 20:07:16 +0000 (12:07 -0800)
diff --cc CRM/Pledge/BAO/Pledge.php
Simple merge
diff --cc tests/phpunit/CRM/Pledge/BAO/PledgeTest.php
Simple merge
author	Tim Otten <totten@civicrm.org>
	Wed, 4 Jan 2017 20:07:16 +0000 (12:07 -0800)
committer	GitHub <noreply@github.com>
	Wed, 4 Jan 2017 20:07:16 +0000 (12:07 -0800)
		1	2
CRM/Pledge/BAO/Pledge.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/phpunit/CRM/Pledge/BAO/PledgeTest.php	patch \|	diff1 \|	diff2 \|	blob \| history