Merge pull request #10176 from JMAConsulting/codeCleanup

author Eileen McNaughton <eileen@mcnaughty.com>

Thu, 20 Apr 2017 21:55:42 +0000 (09:55 +1200)

committer GitHub <noreply@github.com>

Thu, 20 Apr 2017 21:55:42 +0000 (09:55 +1200)
author Eileen McNaughton <eileen@mcnaughty.com>
Thu, 20 Apr 2017 21:55:42 +0000 (09:55 +1200)
committer GitHub <noreply@github.com>
Thu, 20 Apr 2017 21:55:42 +0000 (09:55 +1200)
diff --cc CRM/Contribute/BAO/Contribution.php
Simple merge
diff --cc CRM/Contribute/Form/AbstractEditPayment.php
Simple merge
author	Eileen McNaughton <eileen@mcnaughty.com>
	Thu, 20 Apr 2017 21:55:42 +0000 (09:55 +1200)
committer	GitHub <noreply@github.com>
	Thu, 20 Apr 2017 21:55:42 +0000 (09:55 +1200)
		1	2
CRM/Contribute/BAO/Contribution.php	patch \|	diff1 \|	diff2 \|	blob \| history
CRM/Contribute/Form/AbstractEditPayment.php	patch \|	diff1 \|	diff2 \|	blob \| history