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

Merge commit 'c940014dce8bd' into 4.5-missing-prs
---

06de146ebc52906d0c9805c75bb8dbfdc4a6aa8a