From: colemanw <coleman@civicrm.org>
Date: Tue, 10 Jun 2014 19:37:48 +0000 (+0100)
Subject: Merge pull request #3471 from colemanw/master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=05d7b25a92c400d488f3b41cdda20be941a35d62;p=civicrm-core.git

Merge pull request #3471 from colemanw/master

Fix CRM-14353 and CRM-14697
---

05d7b25a92c400d488f3b41cdda20be941a35d62