From: kurund <kurund@civicrm.org>
Date: Tue, 21 Apr 2015 05:30:02 +0000 (-0600)
Subject: Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-04-20-23-29-59
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=0d259bef5d711eeda394d0694e43349dec7a0ebb;p=civicrm-core.git

Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-04-20-23-29-59
---

0d259bef5d711eeda394d0694e43349dec7a0ebb