Merge remote-tracking branch 'upstream/4.5' into 4.5-4.6-2015-03-23-18-42-19
authorkurund <kurund@civicrm.org>
Mon, 23 Mar 2015 13:13:19 +0000 (18:43 +0530)
committerkurund <kurund@civicrm.org>
Mon, 23 Mar 2015 13:13:19 +0000 (18:43 +0530)
commitfd57ced7b04d32d5fab5e68c1b12aedbf35c2ad8
tree06bf771a1b3b4dafe765dcd26bd68379169c58af
parent2fd36ab16220999d42f6c186ed8cf22323881f3c
parent1031204e3f7d0c4e04197e69051fa53f3d66ab3a
Merge remote-tracking branch 'upstream/4.5' into 4.5-4.6-2015-03-23-18-42-19

Conflicts:
CRM/Contact/Form/CustomData.php