Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-11-04-01-46-50

author kurund <kurund@civicrm.org>

Mon, 3 Nov 2014 20:17:12 +0000 (01:47 +0530)

committer kurund <kurund@civicrm.org>

Mon, 3 Nov 2014 20:17:12 +0000 (01:47 +0530)
author kurund <kurund@civicrm.org>
Mon, 3 Nov 2014 20:17:12 +0000 (01:47 +0530)
committer kurund <kurund@civicrm.org>
Mon, 3 Nov 2014 20:17:12 +0000 (01:47 +0530)
diff --cc CRM/Contribute/BAO/Contribution.php
Simple merge
diff --cc CRM/Core/BAO/ActionSchedule.php
Simple merge
diff --cc css/civicrm.css
Simple merge
diff --cc templates/CRM/Profile/Form/Dynamic.tpl
Simple merge
author	kurund <kurund@civicrm.org>
	Mon, 3 Nov 2014 20:17:12 +0000 (01:47 +0530)
committer	kurund <kurund@civicrm.org>
	Mon, 3 Nov 2014 20:17:12 +0000 (01:47 +0530)
		1	2
CRM/Contribute/BAO/Contribution.php	patch \|	diff1 \|	diff2 \|	blob \| history
CRM/Core/BAO/ActionSchedule.php	patch \|	diff1 \|	diff2 \|	blob \| history
css/civicrm.css	patch \|	diff1 \|	diff2 \|	blob \| history
templates/CRM/Profile/Form/Dynamic.tpl	patch \|	diff1 \|	diff2 \|	blob \| history