From: kurund <kurund@civicrm.org>
Date: Sun, 26 Apr 2015 15:47:36 +0000 (-0600)
Subject: Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-04-26-09-47-18
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=acef22a2302a1ef7c0280affc2322cb249cb4378;p=civicrm-core.git

Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-04-26-09-47-18
---

acef22a2302a1ef7c0280affc2322cb249cb4378