From: colemanw <coleman@civicrm.org>
Date: Thu, 2 Apr 2015 23:22:59 +0000 (-0400)
Subject: Merge pull request #5550 from civicrm/4.5
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=674cb8b854f6008090d4dcce9372ee76346a198f;p=civicrm-core.git

Merge pull request #5550 from civicrm/4.5

Merge branch 4.5 into 4.6
---

674cb8b854f6008090d4dcce9372ee76346a198f