From: kurund <kurund@civicrm.org>
Date: Wed, 4 Mar 2015 13:22:06 +0000 (+0530)
Subject: Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-03-04-18-48-05
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=41f9932b28eee69c9057e909e4e7dec0867ddaaf;p=civicrm-core.git

Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-03-04-18-48-05

Conflicts:
	CRM/Mailing/BAO/Mailing.php
	sql/civicrm_generated.mysql
	xml/version.xml
---

41f9932b28eee69c9057e909e4e7dec0867ddaaf