From: kurund <kurund@civicrm.org>
Date: Mon, 6 Apr 2015 12:38:19 +0000 (+0530)
Subject: Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-04-06-18-08-12
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=009a4454b159f79e24a841126e9b046e9b446919;p=civicrm-core.git

Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-04-06-18-08-12
---

009a4454b159f79e24a841126e9b046e9b446919