From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 16 Feb 2015 18:49:29 +0000 (-0500)
Subject: Merge branch 4.5 into master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=6d699851d58b6116417dd95d5821e1cdbdfe7e42;p=civicrm-core.git

Merge branch 4.5 into master
---

6d699851d58b6116417dd95d5821e1cdbdfe7e42