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

Merge commit 'e2d85c92c3232' into 4.5-missing-prs

Conflicts:
	xml/version.xml
---

9524b0f46e05d79886e39b4b7cd5d9b8db27d0ff