From: Tim Otten <totten@civicrm.org>
Date: Fri, 6 Mar 2015 00:25:54 +0000 (-0800)
Subject: Merge commit '7aa3a631943cb' into 4.5-missing-prs
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2e7e74346432e991f0f53fdf56a76bda8bd855d4;p=civicrm-core.git

Merge commit '7aa3a631943cb' into 4.5-missing-prs
---

2e7e74346432e991f0f53fdf56a76bda8bd855d4