Merge pull request #7290 from monishdeb/testFailures
authorcolemanw <coleman@civicrm.org>
Tue, 24 Nov 2015 20:11:18 +0000 (15:11 -0500)
committercolemanw <coleman@civicrm.org>
Tue, 24 Nov 2015 20:11:18 +0000 (15:11 -0500)
commitc111cd3851803e83c7b69ce08f51884b8b6ad56e
tree3b54167c9fab4120d54986a8892898a65dc68477
parent6346f638628defa75a42c4f54acc26e3f036f74a
parentf4fd60824eaffdef96b7ddea93ce8b48d340b9ef
Merge pull request #7290 from monishdeb/testFailures

CRM-16203 conflict fix in master