From: kurund <kurund@civicrm.org>
Date: Mon, 23 Mar 2015 13:13:19 +0000 (+0530)
Subject: Merge remote-tracking branch 'upstream/4.5' into 4.5-4.6-2015-03-23-18-42-19
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=fd57ced7b04d32d5fab5e68c1b12aedbf35c2ad8;p=civicrm-core.git

Merge remote-tracking branch 'upstream/4.5' into 4.5-4.6-2015-03-23-18-42-19

Conflicts:
	CRM/Contact/Form/CustomData.php
---

fd57ced7b04d32d5fab5e68c1b12aedbf35c2ad8