Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-04-06-18-08-12
authorkurund <kurund@civicrm.org>
Mon, 6 Apr 2015 12:38:19 +0000 (18:08 +0530)
committerkurund <kurund@civicrm.org>
Mon, 6 Apr 2015 12:38:19 +0000 (18:08 +0530)
commit009a4454b159f79e24a841126e9b046e9b446919
treeac0bd5751abf190a42e4326bb20f32450ab11148
parentd57687335c5ccb93d5d45e3355cdd415302d0fb9
parent7db8f995f0071ab94f275023c738195da2804db7
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-04-06-18-08-12
CRM/Core/BAO/Mapping.php
CRM/Event/Form/Participant.php
CRM/Profile/Form.php
js/Common.js