From: kurund <kurund@civicrm.org>
Date: Mon, 6 Jul 2015 09:12:10 +0000 (+0530)
Subject: Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-07-06-14-41-49
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d6fa07ba73acb0263a0bab610fbc27636446205a;p=civicrm-core.git

Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-07-06-14-41-49
---

d6fa07ba73acb0263a0bab610fbc27636446205a