Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-04-06-18-08-12

author kurund <kurund@civicrm.org>

Mon, 6 Apr 2015 12:38:19 +0000 (18:08 +0530)

committer kurund <kurund@civicrm.org>

Mon, 6 Apr 2015 12:38:19 +0000 (18:08 +0530)
author kurund <kurund@civicrm.org>
Mon, 6 Apr 2015 12:38:19 +0000 (18:08 +0530)
committer kurund <kurund@civicrm.org>
Mon, 6 Apr 2015 12:38:19 +0000 (18:08 +0530)
diff --cc CRM/Core/BAO/Mapping.php
Simple merge
diff --cc CRM/Event/Form/Participant.php
Simple merge
diff --cc CRM/Profile/Form.php
Simple merge
diff --cc js/Common.js
Simple merge
author	kurund <kurund@civicrm.org>
	Mon, 6 Apr 2015 12:38:19 +0000 (18:08 +0530)
committer	kurund <kurund@civicrm.org>
	Mon, 6 Apr 2015 12:38:19 +0000 (18:08 +0530)
		1	2
CRM/Core/BAO/Mapping.php	patch \|	diff1 \|	diff2 \|	blob \| history
CRM/Event/Form/Participant.php	patch \|	diff1 \|	diff2 \|	blob \| history
CRM/Profile/Form.php	patch \|	diff1 \|	diff2 \|	blob \| history
js/Common.js	patch \|	diff1 \|	diff2 \|	blob \| history