From: colemanw <coleman@civicrm.org>
Date: Tue, 24 Nov 2015 20:11:18 +0000 (-0500)
Subject: Merge pull request #7290 from monishdeb/testFailures
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=c111cd3851803e83c7b69ce08f51884b8b6ad56e;p=civicrm-core.git

Merge pull request #7290 from monishdeb/testFailures

CRM-16203 conflict fix in master
---

c111cd3851803e83c7b69ce08f51884b8b6ad56e