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

Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-03-23-18-45-28
---

6b3ee0c3815dca3b70fd03405c70f33fb2d2aa75